- sr-dev - kamailio.org

git:master:93c8b40b: tm: t_reply() skip sending reply if FL_MSG_NOREPLY is set
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 93c8b40bb08c8e0d1cc4440e5261fc1965cc6a21 URL: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T12:03:11+02:00 tm: t_reply() skip sending reply if FL_MSG_NOREPLY is set --- Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… Patch: https://github.com/kamailio/kamailio/commit/93c8b40bb08c8e0d1cc4440e5261fc1… --- diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 68df52b5c1..6d8259aae4 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -1327,6 +1327,10 @@ static int ki_t_reply(sip_msg_t* msg, int code, str* reason) LM_DBG("ACKs are not replied\n"); return -1; } + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } if (t_check( msg , 0 )==-1) return -1; t=get_t();

1 0

git:master:7c39625e: sl: skip sending reply if FL_MSG_NOREPLY is set
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 7c39625e94a3c8cb5a2e1879454b4ce7f1888a93 URL: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T11:53:12+02:00 sl: skip sending reply if FL_MSG_NOREPLY is set --- Modified: src/modules/sl/sl.c Modified: src/modules/sl/sl_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… Patch: https://github.com/kamailio/kamailio/commit/7c39625e94a3c8cb5a2e1879454b4ce… --- diff --git a/src/modules/sl/sl.c b/src/modules/sl/sl.c index c523e8913b..4d17130a13 100644 --- a/src/modules/sl/sl.c +++ b/src/modules/sl/sl.c @@ -250,6 +250,11 @@ int send_reply(struct sip_msg *msg, int code, str *reason) struct cell *t; int ret = 1; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + if(reason->s[reason->len-1]=='\0') { r = reason->s; } else { diff --git a/src/modules/sl/sl_funcs.c b/src/modules/sl/sl_funcs.c index dbc5105d2c..1e408e653f 100644 --- a/src/modules/sl/sl_funcs.c +++ b/src/modules/sl/sl_funcs.c @@ -133,6 +133,11 @@ int sl_reply_helper(struct sip_msg *msg, int code, char *reason, str *tag) if (msg->first_line.u.request.method_value==METHOD_ACK) goto error; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + init_dest_info(&dst); if (reply_to_via) { if (update_sock_struct_from_via(&dst.to, msg, msg->via1 )==-1) @@ -355,6 +360,11 @@ int sl_reply_error(struct sip_msg *msg ) int sip_error; int ret; + if(msg->msg_flags & FL_MSG_NOREPLY) { + LM_INFO("message marked with no-reply flag\n"); + return -2; + } + ret=err2reason_phrase( prev_ser_error, &sip_error, err_buf, sizeof(err_buf), "SL"); if (ret>0) {

1 0

git:master:8a2a7ee6: sanity: set internal flag FL_MSG_NOREPLY if From/To headers are broken
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 8a2a7ee6d12db57dd32127f56cea31d58d8a74c9 URL: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 sanity: set internal flag FL_MSG_NOREPLY if From/To headers are broken --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… Patch: https://github.com/kamailio/kamailio/commit/8a2a7ee6d12db57dd32127f56cea31d… --- diff --git a/src/modules/sanity/sanity.c b/src/modules/sanity/sanity.c index c125660387..292474aa8e 100644 --- a/src/modules/sanity/sanity.c +++ b/src/modules/sanity/sanity.c @@ -52,8 +52,10 @@ int sanity_reply(sip_msg_t *msg, int code, char *reason) if(msg->REQ_METHOD == METHOD_ACK) { return 1; } - if(slb.zreply(msg, code, reason) < 0) { - return -1; + if(!(msg->msg_flags&FL_MSG_NOREPLY)) { + if(slb.zreply(msg, code, reason) < 0) { + return -1; + } } return 0; } @@ -684,11 +686,12 @@ int check_parse_uris(struct sip_msg* _msg, int checks) { LM_DBG("looking up From header\n"); if ((!_msg->from && parse_headers(_msg, HDR_FROM_F, 0) != 0) || !_msg->from) { - LM_WARN("missing from header\n"); + LM_WARN("invalid from header\n"); if (_msg->REQ_METHOD != METHOD_ACK) { - if (sanity_reply(_msg, 400, "Missing From Header") < 0) { + if (sanity_reply(_msg, 400, "Invalid From Header") < 0) { LM_WARN("failed to send 400 via sl reply (missing From)\n"); } + _msg->msg_flags |= FL_MSG_NOREPLY; } return SANITY_CHECK_FAILED; } @@ -741,11 +744,12 @@ int check_parse_uris(struct sip_msg* _msg, int checks) { LM_DBG("looking up To header\n"); if ((!_msg->to && parse_headers(_msg, HDR_TO_F, 0) != 0) || !_msg->to) { - LM_WARN("missing to header\n"); + LM_WARN("invalid To header\n"); if (_msg->REQ_METHOD != METHOD_ACK) { - if (sanity_reply(_msg, 400, "Missing To Header") < 0) { + if (sanity_reply(_msg, 400, "Ivalid To Header") < 0) { LM_WARN("failed to send 400 via sl reply (missing To)\n"); } + _msg->msg_flags |= FL_MSG_NOREPLY; } return SANITY_CHECK_FAILED; }

1 0

git:master:37e9d645: core: parse msg - added internal flag to skip sending a reply
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 37e9d645f12401fc0394bec2bc813e3e7f191255 URL: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 core: parse msg - added internal flag to skip sending a reply --- Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… Patch: https://github.com/kamailio/kamailio/commit/37e9d645f12401fc0394bec2bc813e3… --- diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 5922cfc1cc..0bbf83d9da 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -107,6 +107,7 @@ typedef enum request_method { #define FL_UAC_AUTH (1<<19) /* Proxy UAC-like authentication */ #define FL_ADD_SRVID (1<<20) /*!< add 'srvid' to local via hdr */ #define FL_ADD_XAVP_VIA (1<<21) /*!< add xavp fields to local via params */ +#define FL_MSG_NOREPLY (1<<22) /*!< do not send sip reply for request */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */

1 0

git:master:e2b0106f: sanity: remove use of EXTRA_DEBUG define
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: e2b0106f15b73444c39fd9dd208299dd934c6b75 URL: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T10:27:40+02:00 sanity: remove use of EXTRA_DEBUG define - allow seeing dbg messages useful for troubleshooting --- Modified: src/modules/sanity/sanity.c --- Diff: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d… Patch: https://github.com/kamailio/kamailio/commit/e2b0106f15b73444c39fd9dd208299d…

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

- URL: https://github.com/kamailio/kamailio/commit/b6f49f92e11b3289a074cfe8a62d164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:25:39+02:00 sdpops: cast in dbg message to avoid compile warning on 32b systems (cherry picked from commit f6921b92d382db3c0a72bd1d97eb46d1f4aee2d7) - URL: https://github.com/kamailio/kamailio/commit/dd9bc5441ec4682213ed2fa07d8a7f7… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2018-09-10T08:26:02+02:00 modules/auth: fixed path in auth.xml (cherry picked from commit 26449dc2da3b47dd71265e8103de5957bd2245f4) - URL: https://github.com/kamailio/kamailio/commit/ff6af9edbbb08f6ccb9ae953b9ea6d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:29+02:00 core: debug message when dropping a sip reply (cherry picked from commit e4d2ca28ee2d42683d7604c6a767a201b6babbed) - URL: https://github.com/kamailio/kamailio/commit/d0f1d8212f0f42df8a1cc1e5c7b85fc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:41+02:00 core: more accurate debug messages when forwarding a reply (cherry picked from commit 085e2c2ea5f85616c037b083495094a2232c405a) - URL: https://github.com/kamailio/kamailio/commit/5d6be9c971a0cd1bf3ebd10214e89f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:27:55+02:00 tm: more debug messages for reply relay (cherry picked from commit 927d738d0e1585ccbccc878ab55c219ae737091d) - URL: https://github.com/kamailio/kamailio/commit/8c191147abac8ffb1d2360f6a115617… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:28:09+02:00 tm: added fcount field for free operations debugging (cherry picked from commit e361e5ec2883775d14d92d46659d062b31c45f33) - URL: https://github.com/kamailio/kamailio/commit/3164b552f78762591199df6c29db55d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:04+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the empty string ("") if it is $null (cherry picked from commit b98cb43b1ea33706fe133f6585c0705892663ae6) - URL: https://github.com/kamailio/kamailio/commit/9db1528afb6b6d90251a25f42d8f4f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:16+02:00 app_lua: split function for returning pv null value (cherry picked from commit f3312715943867f76c8753eba992dad5859d8c2f) - URL: https://github.com/kamailio/kamailio/commit/c26b2fac5eefb47edcdba65a7ba9d68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:30+02:00 app_lua: new KEMI pv functions KSR.pv.getvn(...) and KSR.pv.getvs(...) - KSR.pv.getvn(pv, ival) - return the value of pv if not null, otherwise return the int value ival - KSR.pv.getvs(pv, sval) - return the value of pv if not null, otherwise return the str value sval (cherry picked from commit 1576dc7cf504a3a30e83919222f1b8441e4207b5) - URL: https://github.com/kamailio/kamailio/commit/4b05951967fb9460a0158fdb1765e4a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:29:39+02:00 app_lua: proper return 'nil' for $null values of pvs (cherry picked from commit fd3656fba3fe5dcb472836f935e2b4781b02251e) - URL: https://github.com/kamailio/kamailio/commit/527c20056413d0cd088b8aadd2d84a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:05+02:00 app_python: implemented KSR.pv.gete(...) (cherry picked from commit 63498d6c2180645562f495077d6b414b12b39820) - URL: https://github.com/kamailio/kamailio/commit/9a3d4698491a4f020b1c0d4635f1d3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:30+02:00 app_jsdt: implemented kemi KSR.pv.gete(...) (cherry picked from commit d92216ebdb94c4a068437c083c9f1809ddfa8857) - URL: https://github.com/kamailio/kamailio/commit/57debe742063c776cf8b91e34d5cbe3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:41+02:00 ipops: exported KSR.ipops.is_in_subnet(...) - match the function name from kamailio.cfg - so far it was exported as KSR.ipops.ip_is_in_subnet(...) (cherry picked from commit 7bd55ca760a2b1aed8da431b61370c750742ff84) - URL: https://github.com/kamailio/kamailio/commit/44fc897c51f23f3da3c0d556a270edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:30:52+02:00 app_sqlang: implemented KSR.pv.gete(...) (cherry picked from commit 89c65fa3210ab0682d4cb699d732ac1653ba0221) - URL: https://github.com/kamailio/kamailio/commit/50910ac1035df1d3899389d72314353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:31:10+02:00 app_python: give scan format to PyArg_ParseTuple() via param (cherry picked from commit c1701cf3e57adbf8448c414bfb8ba10426a69104) - URL: https://github.com/kamailio/kamailio/commit/b6ed4d39c68f543f18a4a938d1bba37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:31:27+02:00 app_lua: rmode 1 corresponds to int returned value (cherry picked from commit b7047205287a0fde12b3568bd0cd0425eeb68fcd) - URL: https://github.com/kamailio/kamailio/commit/57d8b5287d27fe32b302442c2b18a17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:32:17+02:00 tls: docs - some updates to sample tls.cfg (cherry picked from commit 957b43ddea8dad434736e800a16581d49ccb2478) - URL: https://github.com/kamailio/kamailio/commit/6815f91eba33216102f7e8ebb0a67e7… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-09-10T08:33:02+02:00 tm: crash on memcpy fix - in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added. (cherry picked from commit db3b9dbd48f7bb74abf08b0e97bcac15015df719) - URL: https://github.com/kamailio/kamailio/commit/2ce4f035be25c8d43a96d24331a5673… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:33:29+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 (cherry picked from commit 35aef078dfbcb92de9591eea2841b3ba0f9682f6) - URL: https://github.com/kamailio/kamailio/commit/7417602f16f17495bad935e87ef504a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:01+02:00 core: xavp - more debug details when printing xavp (cherry picked from commit 3fef2b3c18f83add1af13c2b84303b507e27aeca) - URL: https://github.com/kamailio/kamailio/commit/82117ce2d576a1f9073e36d1e0508d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:28+02:00 htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi - GH #1614 (cherry picked from commit 9121118444e638223c789641618ed4145a67b0f3) - URL: https://github.com/kamailio/kamailio/commit/290073feb2ebf94bfa64be8071cf4cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:34:47+02:00 pv: increased transformation buffer slots from 4 to 8 (cherry picked from commit d68c1bcb350bce2f1951b604f97e246734e43b84) - URL: https://github.com/kamailio/kamailio/commit/31fd064f209246ef028d0d2369be9e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:35:42+02:00 htable: exported sht_rm_name() and sht_rm_value() to KEMI (cherry picked from commit 2806831045cdb8f110737a87470382c28c5ce094) - URL: https://github.com/kamailio/kamailio/commit/1fd8cc14ae5a81359ece661677b7818… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:11+02:00 htable: proper return on match for sw operator whith rm functions (cherry picked from commit dec17cb6af275789c4ae804d5e1004a9f77010a3) - URL: https://github.com/kamailio/kamailio/commit/e6676483116cac28a958d5dc5edeea3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:26+02:00 tcpops: more debug messages when executing event route (cherry picked from commit d453bdd36a6cd569978a1d19e41d55b28c2b4e13) - URL: https://github.com/kamailio/kamailio/commit/ce5fd6f415e504f967e00820d6c57ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:36:52+02:00 core: tcp - improved safety check for available byte in tcp read buffer (cherry picked from commit 2fc11f183d8fcedeb35559c5236ad7159a6a5864) - URL: https://github.com/kamailio/kamailio/commit/aec30b799256fc3c1aeac537d111ecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:05+02:00 core: tcp - more safety check to avoid jumping out if receive buf for ws proto (cherry picked from commit db00d11d6a30cb779cecfae73487de6d05b6b915) - URL: https://github.com/kamailio/kamailio/commit/aa7d8921eac1379f3d31648f99f7138… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:29+02:00 tls: cast to usigned for computing available size for read (cherry picked from commit 1e67fdd53a1c6dc3964d25e891caad24029b7887) - URL: https://github.com/kamailio/kamailio/commit/d877cd62175dd31d8eb7a1fbcabb32b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:38:57+02:00 rtpengine: safety check for tm uas.request field (cherry picked from commit 75040f62238d6181dc9aec977588c63d15dc5cbc) - URL: https://github.com/kamailio/kamailio/commit/b03b6f7a12e66eab1619e1f10eeba67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:52:53+02:00 acc: more debug message when checking if acc should be done (cherry picked from commit f21554c6befaddbc82016d5d498e11ab3720c404) - URL: https://github.com/kamailio/kamailio/commit/5195a700241650a1407f4e663db4c6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:05+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... (cherry picked from commit 5b223a2e8a92f351b8eab756f5256fda7645ff21) - URL: https://github.com/kamailio/kamailio/commit/c9b1410c13fb8d70d4785779b499898… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:14+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align (cherry picked from commit 1aad02edc6b9ffb104900cbc624f0853166ae926) - URL: https://github.com/kamailio/kamailio/commit/7438c7511c4ee151d5126ee34748e49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:34+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far (cherry picked from commit 0ea62995ab026737411f3106a4584ba4ba640426) - URL: https://github.com/kamailio/kamailio/commit/ebcffdb917b2c2c0a1b6d85cbf9c46e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:53:44+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer (cherry picked from commit 35dec4c20d78f49ba242229c877894d70c94705c) - URL: https://github.com/kamailio/kamailio/commit/fb69f81152368b8727f6d51298b6f8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:14+02:00 dialog: update active and early dialogs stats for dmq operations - related to GH #1591 (cherry picked from commit bc41d0bc75f1b41f0185eeed37d5514525ef27be) - URL: https://github.com/kamailio/kamailio/commit/3c4f242fff1171fbe9c19472b8d9430… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:25+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 (cherry picked from commit deb2904d73a7a540f8eb6e2e8722185b7f0a9a99) - URL: https://github.com/kamailio/kamailio/commit/9ff43b7f8017fb68681a49379ab9273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:36+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized (cherry picked from commit 1501e20b65f63c64a89b84196dc925cef79b7c76) - URL: https://github.com/kamailio/kamailio/commit/780e44b9045e6051fc7f41a34db2418… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T09:54:47+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 (cherry picked from commit 1db7dc4de6588131b4340390b5996141940b7ef0)

1 0

git:master:275290bd: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 275290bd7387b7794c4ae1bef1c94ee07007bece URL: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-12T08:47:05+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… Patch: https://github.com/kamailio/kamailio/commit/275290bd7387b7794c4ae1bef1c94ee… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index de3ce988ea..60954cd3c7 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -150,10 +150,11 @@ Ovidiu Sas 1.42. starts_with usage 1.43. set_body_multipart usage 1.44. append_body_part usage - 1.45. append_body_part_hex usage - 1.46. get_body_part usage - 1.47. get_body_part_raw usage - 1.48. remove_body_part usage + 1.45. append_body_part with headers + 1.46. append_body_part_hex usage + 1.47. get_body_part usage + 1.48. get_body_part_raw usage + 1.49. remove_body_part usage Chapter 1. Admin Guide @@ -1196,7 +1197,7 @@ text Example 1.44. append_body_part usage ... -$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling =required"); ... @@ -1209,6 +1210,27 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... + + If other headers are wanted to be added for a body part, they can be + appended after the value of the content-type parameter, separated by + `\r\n` (at the very end do not add the '\r\n'). + + Example 1.45. append_body_part with headers +... +$var(b) = ""; +append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +... + +# Will append this to the body: + +... +Content-Type: application/vnd.cirpack.isdn-ext +Content-Disposition: signal;handling=required + +7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c + --unique-boundary-1 ... @@ -1233,7 +1255,7 @@ Content-Disposition: signal;handling=required The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. - Example 1.45. append_body_part_hex usage + Example 1.46. append_body_part_hex usage ... $var(b) = "6b 61 6d 61 69 6c 69 6f"; append_body_part_hex("$var(b)", "application/my-custom-ext"); @@ -1249,6 +1271,9 @@ kamailio --unique-boundary-1 ... + If other headers are wanted to be added for a body part, see the docs + for append_body_part(...) function. + 4.46. get_body_part(content_type, opv) Return the content of a multipart body SIP message, storing it in opv. @@ -1262,7 +1287,7 @@ kamailio This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, ONREPLY_ROUTE. - Example 1.46. get_body_part usage + Example 1.47. get_body_part usage ... get_body_part("application/vnd.cirpack.isdn-ext", "$var(pbody)"); ... @@ -1281,7 +1306,7 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(pbody)"); This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE, ONREPLY_ROUTE. - Example 1.47. get_body_part_raw usage + Example 1.48. get_body_part_raw usage ... get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); ... @@ -1301,7 +1326,7 @@ get_body_part("application/vnd.cirpack.isdn-ext", "$var(hbody)"); The core will take care of the last boundary ending "--". Detecting wich one is the last and fixing the others if needed. - Example 1.48. remove_body_part usage + Example 1.49. remove_body_part usage ... remove_body_part("application/vnd.cirpack.isdn-ext"); ...

1 0

[kamailio/kamailio] Feature request: Wanted support of Content-ID in append_body_part (#1632)
by sergey-safarov 12 Sep '18

12 Sep '18

### Description According [RFC6442](https://tools.ietf.org/html/rfc6442#section-5.1) multipart body may contain payload with `Content-ID` header. Now `append_body_part` support only `Content-Disposition` optional header and not supports `Content-ID`. Wanted `Content-ID` to implement RFC6442 -- 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/1632

2 5

git:master:64097569: textops: docs - note about how to add additional headers for a body part
by Daniel-Constantin Mierla 12 Sep '18

12 Sep '18

Module: kamailio Branch: master Commit: 64097569eccad8185117255a6018a32615c9945d URL: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-12T08:40:01+02:00 textops: docs - note about how to add additional headers for a body part - GH #1632 --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… Patch: https://github.com/kamailio/kamailio/commit/64097569eccad8185117255a6018a32… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index cfcca4daf6..8e0f350056 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1694,7 +1694,7 @@ text <title><function>append_body_part</function> usage</title> <programlisting format="linespecific"> ... -$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c" +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext", "signal;handling=required"); ... @@ -1706,6 +1706,31 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... +</programlisting> + </example> + <para> + If other headers are wanted to be added for a body part, they can be + appended after the value of the content-type parameter, separated by + `\r\n` (at the very end do not add the '\r\n'). + </para> + <example> + <title><function>append_body_part</function> with headers</title> + <programlisting format="linespecific"> +... +$var(b) = "<info>active</info>"; +append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +... + +# Will append this to the body: + +... +Content-Type: application/vnd.cirpack.isdn-ext +Content-Disposition: signal;handling=required + +7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c + --unique-boundary-1 ... </programlisting> @@ -1767,6 +1792,10 @@ kamailio ... </programlisting> </example> + <para> + If other headers are wanted to be added for a body part, see the docs + for append_body_part(...) function. + </para> </section> <section id="textops.f.get_body_part">

1 0

[kamailio/kamailio] jsonrpc reply error (#1640)
by juha-h 12 Sep '18

12 Sep '18

When I execute pua.publish over jsonrpc using pretty new Kamailio master: ```` # T 2018/09/11 18:19:03.550376 127.0.0.1:44190 -> 127.0.0.1:6060 [AP] POST /RPC HTTP/1.1. Host: 127.0.0.1:6060. Accept: */*. Content-Type: application/json. Content-Length: 339. .. {"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1} # T 2018/09/11 18:19:03.551735 127.0.0.1:5070 -> 127.0.0.1:5080 [AP] PUBLISH sip:test@test.tutpro.com SIP/2.0. ... # T 2018/09/11 18:19:03.553158 127.0.0.1:5080 -> 127.0.0.1:5070 [AP] SIP/2.0 200 OK. ... CSeq: 10 PUBLISH. # T 2018/09/11 18:19:03.556790 127.0.0.1:6060 -> 127.0.0.1:44190 [AP] HTTP/1.1 200 OK. Sia: SIP/2.0/TCP 127.0.0.1:44190. Content-Type: application/json. Server: OpenSIPg SIP Proxy (5.2.0-0b02 (x86_64/linux)). Content-Length: 48. .. { ."jsonrpc":."2.0", ."result":.{ .}, ."id":.1 } ```` I get error at reply: ```` Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context Sep 11 18:19:03 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context ```` -- 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/1640

3 5

git:master:1db7dc4d: jsonrpcs: set global active context to delayed value for async commands
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 1db7dc4de6588131b4340390b5996141940b7ef0 URL: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T23:12:02+02:00 jsonrpcs: set global active context to delayed value for async commands - GH #1640 --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… Patch: https://github.com/kamailio/kamailio/commit/1db7dc4de6588131b4340390b599614… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 5c558c60c4..1fd737298a 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -120,7 +120,8 @@ extern int jsonrpc_dgram_destroy(void); * being currently processed. * @sa rpc_ctx */ -static jsonrpc_ctx_t _jsonrpc_ctx; +static jsonrpc_ctx_t _jsonrpc_ctx_global; +static jsonrpc_ctx_t *_jsonrpc_ctx_active = NULL; static xhttp_api_t xhttp_api; @@ -277,6 +278,7 @@ static int jsonrpc_delayed_reply_ctx_init(jsonrpc_ctx_t* ctx) if (jsonrpc_init_reply(ctx) < 0) return -1; jsonrpc_reset_plain_reply(ctx->jrpl->free_fn); + _jsonrpc_ctx_active = ctx; } return 0; } @@ -773,10 +775,10 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) } isobject = (jnode->type==srjson_Object); - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -844,10 +846,10 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -905,10 +907,10 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) return -1; } - ctx = &_jsonrpc_ctx; - if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", - ctx->flags); + ctx = _jsonrpc_ctx_active; + if(ctx==NULL || ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context %p - flags 0x%x\n", + ctx, (ctx)?ctx->flags:0); return -1; } @@ -1100,6 +1102,7 @@ static void jsonrpc_delayed_ctx_close(struct rpc_delayed_ctx* dctx) r_ctx->msg=0; dctx->reply_ctx=0; shm_free(dctx); + _jsonrpc_ctx_active = NULL; return; } @@ -1233,7 +1236,8 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) } /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = msg; /* parse the jsonrpc request */ @@ -1312,7 +1316,8 @@ int jsonrpc_exec_ex(str *cmd, str *rpath) scmd = *cmd; /* initialize jsonrpc context */ - ctx = &_jsonrpc_ctx; + _jsonrpc_ctx_active = &_jsonrpc_ctx_global; + ctx = _jsonrpc_ctx_active; memset(ctx, 0, sizeof(jsonrpc_ctx_t)); ctx->msg = NULL; /* mark it not send a reply out */ /* parse the jsonrpc request */

1 0

git:master:1501e20b: jsonrpcs: print flags in error message when rpc reply is not initialized
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 1501e20b65f63c64a89b84196dc925cef79b7c76 URL: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T20:31:07+02:00 jsonrpcs: print flags in error message when rpc reply is not initialized --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… Patch: https://github.com/kamailio/kamailio/commit/1501e20b65f63c64a89b84196dc925c… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_mod.c b/src/modules/jsonrpcs/jsonrpcs_mod.c index 11857fe11e..5c558c60c4 100644 --- a/src/modules/jsonrpcs/jsonrpcs_mod.c +++ b/src/modules/jsonrpcs/jsonrpcs_mod.c @@ -775,7 +775,8 @@ static int jsonrpc_struct_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -845,7 +846,8 @@ static int jsonrpc_array_add(srjson_t *jnode, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; } @@ -905,7 +907,8 @@ static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) ctx = &_jsonrpc_ctx; if(ctx->jrpl==NULL) { - LM_ERR("reply object not initialized in rpl context\n"); + LM_ERR("reply object not initialized in rpl context - flags 0x%x\n", + ctx->flags); return -1; }

1 0

[kamailio/kamailio] Unable to change tls connection_timeout via kamcmd (#1639)
by arkadiam 11 Sep '18

11 Sep '18

### Description Following tls module documentation I'm trying to change connection_timeout value: ``` # kamcmd cfg.set_now_int tls connection_timeout 300 error: 400 - Failed to set the variable ```  ### Troubleshooting #### Log Messages  ``` Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:442]: handle_new_connect(): handle_stream read: new connection (1) on /var/run/kamailio//kamailio_ctl Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:386]: cfg_set_now(): ERROR: cfg_set_now(): integer value is out of range Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: ERROR: <core> [core/cfg/cfg_ctx.c:653]: cfg_set_now(): ERROR: cfg_set_now(): failed to set the variable: tls.connection_timeout Sep 11 10:07:32 sip02 /usr/sbin/kamailio[32408]: DEBUG: ctl [io_listener.c:495]: handle_stream_read(): handle_stream read: eof on /var/run/kamailio//kamailio_ctl ``` ### Possible Solutions Workaround: restart kamailio instead of trying to change variable of the running instance.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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 with gcc 5.3.1 ``` * **Operating System**:  ``` Linux sip02 4.4.0-134-generic #160-Ubuntu SMP Wed Aug 15 14:58:00 UTC 2018 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/1639

2 4

git:master:deb2904d: tls: proper upper limit for tls connection lifetime
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: deb2904d73a7a540f8eb6e2e8722185b7f0a9a99 URL: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:50:25+02:00 tls: proper upper limit for tls connection lifetime - GH #1639 --- Modified: src/modules/tls/tls_cfg.h --- Diff: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… Patch: https://github.com/kamailio/kamailio/commit/deb2904d73a7a540f8eb6e2e8722185… --- diff --git a/src/modules/tls/tls_cfg.h b/src/modules/tls/tls_cfg.h index b4427dda3e..ae404e14bc 100644 --- a/src/modules/tls/tls_cfg.h +++ b/src/modules/tls/tls_cfg.h @@ -34,8 +34,7 @@ /* maximum accepted lifetime (maximum possible is ~ MAXINT/2) * (it should be kept in sync w/ MAX_TCP_CON_LIFETIME from tcp_main.c: * MAX_TLS_CON_LIFETIME <= MAX_TCP_CON_LIFETIME )*/ -#define MAX_TLS_CON_LIFETIME (1U<<(sizeof(ticks_t)*8-1)) - +#define MAX_TLS_CON_LIFETIME ((1U<<(sizeof(ticks_t)*8-1))-1) struct cfg_group_tls {

1 0

git:master:bc41d0bc: dialog: update active and early dialogs stats for dmq operations
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: bc41d0bc75f1b41f0185eeed37d5514525ef27be URL: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T16:41:55+02:00 dialog: update active and early dialogs stats for dmq operations - related to GH #1591 --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… Patch: https://github.com/kamailio/kamailio/commit/bc41d0bc75f1b41f0185eeed37d5514… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 0cfd8a522e..08dbc84686 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -38,6 +38,7 @@ dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync(); +extern int dlg_enable_stats; /** * @brief add notification peer @@ -113,6 +114,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no unsigned int init_ts = 0, start_ts = 0, lifetime = 0; unsigned int state = 1; srjson_t *vj; + int newdlg = 0; /* received dmq message */ LM_DBG("dmq message received\n"); @@ -246,6 +248,7 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no /* prevent DB sync */ dlg->dflags &= ~(DLG_FLAG_NEW|DLG_FLAG_CHANGED); dlg->iflags |= DLG_IFLAG_DMQ_SYNC; + newdlg = 1; } else { /* remove existing profiles */ if (dlg->profile_links!=NULL) { @@ -341,6 +344,13 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg_unref(dlg, unref); goto error; } + if(newdlg==1) { + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, 1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, 1); + } + } dlg->state = state; break; @@ -363,6 +373,11 @@ int dlg_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* no dlg, dlg->h_entry, dlg->h_id); } } + if (state==DLG_STATE_CONFIRMED_NA || state==DLG_STATE_CONFIRMED) { + if_update_stat(dlg_enable_stats, active_dlgs, -1); + } else if (dlg->state==DLG_STATE_EARLY) { + if_update_stat(dlg_enable_stats, early_dlgs, -1); + } /* prevent DB sync */ dlg->dflags |= DLG_FLAG_NEW; dlg->iflags &= ~DLG_IFLAG_DMQ_SYNC;

1 0

git:master:83adc896: htable: export sht_sets() and sht_seti() to kemi framework
by Daniel-Constantin Mierla 11 Sep '18

11 Sep '18

Module: kamailio Branch: master Commit: 83adc8963ef2fa324297beb70ca295a871931c95 URL: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-11T12:34:36+02:00 htable: export sht_sets() and sht_seti() to kemi framework --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… Patch: https://github.com/kamailio/kamailio/commit/83adc8963ef2fa324297beb70ca295a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 04c4bb7c9a..61b9e8896a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -912,6 +912,70 @@ int ht_param(modparam_t type, void *val) } +/** + * + */ +static int ki_ht_sets(sip_msg_t *msg, str *htname, str *itname, str *itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.s = *itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, AVP_VAL_STR, &isvalue, 1)!=0) { + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + +/** + * + */ +static int ki_ht_seti(sip_msg_t *msg, str *htname, str *itname, int itval) +{ + int_str isvalue; + ht_t *ht; + + /* Find the htable */ + ht = ht_get_table(htname); + if (!ht) { + LM_ERR("No such htable: %.*s\n", htname->len, htname->s); + return -1; + } + + isvalue.n = itval; + + if (ht->dmqreplicate>0 && ht_dmq_replicate_action(HT_DMQ_SET_CELL, + &ht->name, itname, 0, &isvalue, 1)!=0) { + LM_ERR("dmq relication failed\n"); + } + + if(ht_set_cell(ht, itname, 0, &isvalue, 1)!=0) { + LM_ERR("cannot set sht: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + LM_ERR("cannot set hash table: %.*s key: %.*s\n", htname->len, htname->s, + itname->len, itname->s); + return -1; + } + + return 1; +} + #define RPC_DATE_BUF_LEN 21 static const char* htable_dump_doc[2] = { @@ -1484,6 +1548,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_sets"), + SR_KEMIP_INT, ki_ht_sets, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_seti"), + SR_KEMIP_INT, ki_ht_seti, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:35dec4c2: tm: set uas rb type along with the buffer when relaying replies
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 35dec4c20d78f49ba242229c877894d70c94705c URL: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T19:38:34+02:00 tm: set uas rb type along with the buffer when relaying replies - ensure it is same reply code used in outgoing buffer --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… Patch: https://github.com/kamailio/kamailio/commit/35dec4c20d78f49ba242229c877894d… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 62e844a55a..88ec5dd629 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,7 +1795,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; - totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1808,16 +1807,15 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ - if (save_clone) /* save for later use, typically branch picking */ - { + if (save_clone) { + /* save for later use, typically branch picking */ if (!store_reply( t, branch, p_msg )) goto error01; } - uas_rb = & t->uas.response; + /* initialize for outbound reply */ + uas_rb = &t->uas.response; if (relay >= 0 ) { - /* initialize sockets for outbound reply */ - uas_rb->rbtype=msg_status; /* only messages known to be relayed immediately will be * be called on; we do not evoke this callback on messages * stored in shmem -- they are fixed and one cannot change them @@ -1829,12 +1827,11 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, } /* try building the outbound reply from either the current * or a stored message */ - relayed_msg = branch==relay ? p_msg : t->uac[relay].reply; + relayed_msg = (branch==relay) ? p_msg : t->uac[relay].reply; if (relayed_msg==FAKED_REPLY) { if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; - uas_rb->rbtype = 487; } else { relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; @@ -1889,7 +1886,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; - uas_rb->rbtype = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -1944,6 +1940,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, LM_ERR("cannot alloc reply shmem\n"); goto error03; } + uas_rb->rbtype = relayed_code; uas_rb->buffer_len = res_len; memcpy( uas_rb->buffer, buf, res_len ); if (relayed_msg==FAKED_REPLY) { /* to-tags for local replies */ @@ -1956,13 +1953,13 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, t->relayed_reply_branch = relay; if ( unlikely(is_invite(t) && relayed_msg!=FAKED_REPLY - && relayed_code>=200 && relayed_code < 300 - && has_tran_tmcbs( t, - TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY - |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { + && relayed_code>=200 && relayed_code < 300 + && has_tran_tmcbs( t, + TMCB_RESPONSE_OUT|TMCB_RESPONSE_READY + |TMCB_E2EACK_IN|TMCB_E2EACK_RETR_IN))) { totag_retr=update_totag_set(t, relayed_msg); } - }; /* if relay ... */ + } /* if relay ... */ UNLOCK_REPLIES( t );

1 0

git:master:0ea62995: tm: typedefs renamed to match better module and common pattern
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 0ea62995ab026737411f3106a4584ba4ba640426 URL: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:22:54+02:00 tm: typedefs renamed to match better module and common pattern - were not used so far --- Modified: src/modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… Patch: https://github.com/kamailio/kamailio/commit/0ea62995ab026737411f3106a4584ba… --- diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 7aca7ed92c..bfcd28f2ca 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -162,7 +162,7 @@ typedef struct retr_buf struct dest_info dst; ticks_t retr_expire; ticks_t fr_expire; /* ticks value after which fr. will fire */ -} retr_buf_type; +} tm_retr_buf_t; /* User Agent Server content */ @@ -181,7 +181,7 @@ typedef struct ua_server * for e2e cancels */ #endif /* CANCEL_REASON_SUPPORT */ unsigned int status; -} ua_server_type; +} tm_ua_server_t; /* User Agent Client content */ @@ -244,15 +244,15 @@ typedef struct ua_client unsigned short on_reply; /* unused - keep the structure aligned to 32b */ unsigned short on_unused; -} ua_client_type; +} tm_ua_client_t; -struct totag_elem +typedef struct totag_elem { struct totag_elem *next; str tag; volatile int acked; -}; +} tm_totag_elem_t; /* structure for storing transaction state prior to suspending * of async transactions */ @@ -262,7 +262,7 @@ typedef struct async_state unsigned int backup_branch; unsigned int blind_uac; unsigned int ruri_new; -} async_state_type; +} tm_async_state_t; /* transaction's flags */ /* is the transaction's request an INVITE? */ @@ -506,7 +506,7 @@ typedef struct entry unsigned long cur_entries; #endif char _pad[ENTRY_PAD_BYTES]; -} entry_type; +} tm_entry_t; /* transaction table */

1 0

git:master:1aad02ed: tm: activ_type field renamed to rbtype in struct retr_buf
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 1aad02edc6b9ffb104900cbc624f0853166ae926 URL: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T17:15:30+02:00 tm: activ_type field renamed to rbtype in struct retr_buf - better matching the purpose and do not use a typo word - field t_active changed from char to short for better mem align --- Modified: src/modules/tm/h_table.h Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_hooks.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085… Patch: https://github.com/kamailio/kamailio/commit/1aad02edc6b9ffb104900cbc624f085…

1 0

git:master:5b223a2e: tm: update uas rb activ_type when overwriting realyed_code
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 5b223a2e8a92f351b8eab756f5256fda7645ff21 URL: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T15:03:44+02:00 tm: update uas rb activ_type when overwriting realyed_code - otherwise could end up skipping the execution for TMCB_RESPONSE_OUT tm callback, affecting acc, ... --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… Patch: https://github.com/kamailio/kamailio/commit/5b223a2e8a92f351b8eab756f5256fd… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 271932c90c..14f244ef7d 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1795,6 +1795,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=0; relayed_msg=0; relayed_code=0; + totag_retr=0; /* remember, what was sent upstream to know whether we are @@ -1803,8 +1804,8 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* *** store and relay message as needed *** */ reply_status = t_should_relay_response(t, msg_status, branch, &save_clone, &relay, cancel_data, p_msg ); - LM_DBG("branch=%d, save=%d, relay=%d icode=%d\n", - branch, save_clone, relay, t->uac[branch].icode); + LM_DBG("branch=%d, save=%d, relay=%d icode=%d msg status=%u\n", + branch, save_clone, relay, t->uac[branch].icode, msg_status); /* store the message if needed */ if (save_clone) /* save for later use, typically branch picking */ @@ -1833,8 +1834,9 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(t->flags & T_CANCELED) { /* transaction canceled - send 487 */ relayed_code = 487; + uas_rb->activ_type = 487; } else { - relayed_code = branch==relay + relayed_code = (branch==relay) ? msg_status : t->uac[relay].last_received; } /* use to_tag from the original request, or if not present, @@ -1887,6 +1889,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, buf=build_res_buf_from_sip_req(500, &reason, to_tag, t->uas.request, &res_len, &bm); relayed_code=500; + uas_rb->activ_type = 500; }else if (cfg_get(tm, tm_cfg, tm_aggregate_auth) && (relayed_code==401 || relayed_code==407) && (auth_reply_count(t, p_msg)>1)){ @@ -2003,6 +2006,10 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if(relayed_code==uas_rb->activ_type) { run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, relayed_msg, TMCB_NONE_F); + } else { + LM_DBG("skip tm callback %d - relay code %d active %d\n", + TMCB_RESPONSE_OUT, relayed_code, + uas_rb->activ_type); } UNLOCK_REPLIES( t ); }

1 0

git:master:f21554c6: acc: more debug message when checking if acc should be done
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: f21554c6befaddbc82016d5d498e11ab3720c404 URL: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T09:18:27+02:00 acc: more debug message when checking if acc should be done --- Modified: src/modules/acc/acc_logic.c --- Diff: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… Patch: https://github.com/kamailio/kamailio/commit/f21554c6befaddbc82016d5d498e11a… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index d41108d3bc..e0443ce906 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -411,27 +411,40 @@ static inline int should_acc_reply(struct sip_msg *req, struct sip_msg *rpl, { unsigned int i; + LM_DBG("probing acc state - code: %d flags: 0x%x\n", code, + (req)?req->flags:0); /* negative transactions reported otherwise only if explicitly * demanded */ - if (code >= 300) { - if (!is_failed_acc_on(req)) return 0; + if (!is_failed_acc_on(req)) { + LM_DBG("failed acc is off\n"); + return 0; + } i = 0; while (failed_filter[i] != 0) { - if (failed_filter[i] == code) return 0; + if (failed_filter[i] == code) { + LM_DBG("acc code in filter: %d\n", code); + return 0; + } i++; } + LM_DBG("failed acc is on\n"); return 1; } - if ( !is_acc_on(req) ) + if ( !is_acc_on(req) ) { + LM_DBG("acc is off\n"); return 0; + } if ( code<200 && !(early_media && parse_headers(rpl,HDR_CONTENTLENGTH_F, 0) == 0 && - rpl->content_length && get_content_length(rpl) > 0)) + rpl->content_length && get_content_length(rpl) > 0)) { + LM_DBG("early media acc is off\n"); return 0; + } + LM_DBG("acc is on\n"); return 1; /* seed is through, we will account this reply */ } @@ -461,6 +474,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, int flags_to_reset = 0; int br = -1; + LM_DBG("preparing to report the record\n"); /* get winning branch index, if set */ if (t->relayed_reply_branch>=0) { br = t->relayed_reply_branch;

1 0

jsonrpc reply error
by Juha Heinanen 10 Sep '18

10 Sep '18

When I execute pua.publish over jsonrpc, I get error at reply: Sep 10 09:37:34 char /usr/bin/sip-proxy[11104]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"pua.publish","params":[...],"id":1}> Sep 10 09:37:34 char /usr/bin/sip-proxy[11079]: ERROR: jsonrpcs [jsonrpcs_mod.c:778]: jsonrpc_struct_add(): reply object not initialized in rpl context This is with pretty new master. -- Juha

1 0

git:master:75040f62: rtpengine: safety check for tm uas.request field
by Daniel-Constantin Mierla 10 Sep '18

10 Sep '18

Module: kamailio Branch: master Commit: 75040f62238d6181dc9aec977588c63d15dc5cbc URL: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-10T08:19:02+02:00 rtpengine: safety check for tm uas.request field --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… Patch: https://github.com/kamailio/kamailio/commit/75040f62238d6181dc9aec977588c63… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 4187e61a84..e576117c35 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3310,6 +3310,7 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) { int method; int nosdp; + tm_cell_t *t = NULL; if (msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) || (msg->cseq==NULL))) @@ -3339,9 +3340,12 @@ rtpengine_manage(struct sip_msg *msg, const char *flags) return rtpengine_offer_answer(msg, flags, OP_OFFER, 0); if(method==METHOD_INVITE && nosdp==0) { msg->msg_flags |= FL_SDP_BODY; - if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL - && tmb.t_gett()!=T_UNDEFINED) - tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; + if(tmb.t_gett!=NULL) { + t = tmb.t_gett(); + if(t!=NULL && t!=T_UNDEFINED && t->uas.request!=NULL) { + t->uas.request->msg_flags |= FL_SDP_BODY; + } + } if(route_type==FAILURE_ROUTE) return rtpengine_delete(msg, flags); return rtpengine_offer_answer(msg, flags, OP_OFFER, 0);

1 0

git:master:ac65216b: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: ac65216b26449c05e27aaf772ade75477128a7d7 URL: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-09T15:32:03+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754… Patch: https://github.com/kamailio/kamailio/commit/ac65216b26449c05e27aaf772ade754…

1 0

git:master:40518b64: htable: docs for sht_rm(htname, itname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: 40518b640f1811dd65196bd08e0460dff4e7040a URL: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-09T09:01:11+02:00 htable: docs for sht_rm(htname, itname) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… Patch: https://github.com/kamailio/kamailio/commit/40518b640f1811dd65196bd08e0460d… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 6a8492a94e..e67e7cc74b 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -749,6 +749,26 @@ modparam("htable", "event_callback_mode", 1) ... sht_print(); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_rm"> + <title> + <function moreinfo="none">sht_rm(htname, itname)</function> + </title> + <para> + Delete the item with the name 'itname' from hash table 'htname'. + This API function equivaluent to '$sht(htname=>itname) = $null'. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_rm</function> usage</title> + <programlisting format="linespecific"> +... +sht_rm("ha", "test""); +... </programlisting> </example> </section>

1 0

git:master:f5661587: htable: added sht_rm(htname, iname)
by Daniel-Constantin Mierla 09 Sep '18

09 Sep '18

Module: kamailio Branch: master Commit: f5661587f8547bc878965342aa36ce5e462d3e9a URL: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-08T21:29:11+02:00 htable: added sht_rm(htname, iname) - api function to remove an item from hash table --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… Patch: https://github.com/kamailio/kamailio/commit/f5661587f8547bc878965342aa36ce5… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 214b6e3608..04c4bb7c9a 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -66,6 +66,7 @@ static int child_init(int rank); static void destroy(void); static int fixup_ht_key(void** param, int param_no); +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname); static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo); static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo); static int w_ht_rm_name(struct sip_msg* msg, char* hname, char* op, char *val); @@ -106,7 +107,9 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ - {"sht_print", (cmd_function)ht_print, 0, 0, 0, + {"sht_print", (cmd_function)ht_print, 0, 0, 0, + ANY_ROUTE}, + {"sht_rm", (cmd_function)w_ht_rm, 2, fixup_spve_spve, 0, ANY_ROUTE}, {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_key, 0, ANY_ROUTE}, @@ -543,6 +546,43 @@ static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) return ht_rm_items(msg, sname, sop, sval, 1); } +static int ki_ht_rm(sip_msg_t* msg, str* hname, str* iname) +{ + ht_t *ht; + + ht = ht_get_table(hname); + if(ht==NULL) { + LM_ERR("cannot get hash table [%.*s]\n", hname->len, hname->s); + return -1; + } + + /* delete it */ + if (ht->dmqreplicate>0 + && ht_dmq_replicate_action(HT_DMQ_DEL_CELL, hname, + iname, 0, NULL, 0)!=0) { + LM_ERR("dmq relication failed\n"); + } + ht_del_cell(ht, iname); + return 1; +} + +static int w_ht_rm(sip_msg_t* msg, char* htname, char* itname) +{ + str shtname; + str sitname; + + if(fixup_get_svalue(msg, (gparam_t*)htname, &shtname)<0 || shtname.len<=0) { + LM_ERR("cannot get the hash table name\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t*)itname, &sitname)<0 || sitname.len<=0) { + LM_ERR("cannot get the item table name\n"); + return -1; + } + + return ki_ht_rm(msg, &shtname, &sitname); +} + static int ht_has_str_items(sip_msg_t* msg, str* hname, str* op, str *val, int mkey) { @@ -1409,6 +1449,11 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm"), + SR_KEMIP_INT, ki_ht_rm, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("htable"), str_init("sht_rm_name_re"), SR_KEMIP_INT, ki_ht_rm_name_re, { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE,

1 0

[kamailio/kamailio] [5.1] pkg/kamailio/obs: RPM SPEC update (#1638)
by sergey-safarov 08 Sep '18

08 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1638 -- Commit Summary -- * [5.1] pkg/kamailio/obs: RPM SPEC update -- File Changes -- M pkg/kamailio/obs/kamailio.spec (52) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1638.patch https://github.com/kamailio/kamailio/pull/1638.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/1638

2 1

git:5.1:997ed8ad: Merge pull request #1638 from sergey-safarov/spec_update2
by GitHub 08 Sep '18

08 Sep '18

Module: kamailio Branch: 5.1 Commit: 997ed8adc9a058563e6763959864dc7c11b975d5 URL: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-08T08:53:07+02:00 Merge pull request #1638 from sergey-safarov/spec_update2 [5.1] pkg/kamailio/obs: RPM SPEC update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… Patch: https://github.com/kamailio/kamailio/commit/997ed8adc9a058563e6763959864dc7… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba6512632a..a04b269101 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -62,6 +62,46 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 28 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 29 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -191,7 +231,7 @@ Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver -Conflicts: kamailio-radius < % ver, kamailio-redis < %ver +Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver @@ -416,7 +456,7 @@ This module implements protocol functions that use the libcurl to communicate wi Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons Requires: libxml2, kamailio = %ver -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. @@ -613,7 +653,7 @@ SIP Presence (and RLS, XCAP, etc) support for Kamailio. Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver -BuildRequires: python-devel +BuildRequires: python, python-devel %description python Python extensions for Kamailio. @@ -862,8 +902,6 @@ XML operation functions for Kamailio. %package xmlrpc Summary: XMLRPC transport and encoding for Kamailio RPCs and MI commands Group: System Environment/Daemons -#Requires: libxml2, xmlrpc-c, kamailio = %ver -#BuildRequires: libxml2-devel, xmlrpc-c-devel Requires: libxml2, kamailio = %ver BuildRequires: libxml2-devel @@ -909,13 +947,15 @@ UUID module for Kamailio. ln -s ../obs pkg/kamailio/fedora/24 ln -s ../obs pkg/kamailio/fedora/25 ln -s ../obs pkg/kamailio/fedora/26 +ln -s ../obs pkg/kamailio/fedora/27 +ln -s ../obs pkg/kamailio/fedora/28 +ln -s ../obs pkg/kamailio/fedora/29 mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -rm -Rf pkg/kamailio/centos mkdir -p pkg/kamailio/centos ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7

1 0

git:5.1:a6926871: [5.1] pkg/kamailio/obs: RPM SPEC update
by Sergey Safarov 08 Sep '18

08 Sep '18

Module: kamailio Branch: 5.1 Commit: a692687191ee3d030113534a38c37e4232fbd524 URL: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T11:14:49Z [5.1] pkg/kamailio/obs: RPM SPEC update --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… Patch: https://github.com/kamailio/kamailio/commit/a692687191ee3d030113534a38c37e4… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index ba6512632a..a04b269101 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -62,6 +62,46 @@ %bcond_without xmlrpc %endif +%if 0%{?fedora} == 28 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + +%if 0%{?fedora} == 29 +%define dist_name fedora +%define dist_version %{?fedora} +%bcond_without cnxcc +%bcond_with dnssec +%bcond_without geoip +%bcond_without http_async_client +%bcond_without jansson +%bcond_without json +%bcond_without lua +%bcond_without kazoo +%bcond_without memcached +%bcond_without perl +%bcond_without rabbitmq +%bcond_without redis +%bcond_without sctp +%bcond_without websocket +%bcond_without xmlrpc +%endif + %if 0%{?centos_ver} == 6 %define dist_name centos %define dist_version %{?centos} @@ -191,7 +231,7 @@ Conflicts: kamailio-memcached < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver Conflicts: kamailio-postgresql < %ver, kamailio-presence < %ver Conflicts: kamailio-python < %ver -Conflicts: kamailio-radius < % ver, kamailio-redis < %ver +Conflicts: kamailio-radius < %ver, kamailio-redis < %ver Conflicts: kamailio-regex < %ver, kamailio-sctp < %ver Conflicts: kamailio-sipdump < %ver Conflicts: kamailio-snmpstats < %ver, kamailio-sqlang < %ver, kamailio-sqlite < %ver @@ -416,7 +456,7 @@ This module implements protocol functions that use the libcurl to communicate wi Summary: IMS modules and extensions module for Kamailio Group: System Environment/Daemons Requires: libxml2, kamailio = %ver -BuildRequires: libxml2-devel +BuildRequires: libxml2-devel libmnl-devel %description ims IMS modules and extensions module for Kamailio. @@ -613,7 +653,7 @@ SIP Presence (and RLS, XCAP, etc) support for Kamailio. Summary: Python extensions for Kamailio Group: System Environment/Daemons Requires: python, kamailio = %ver -BuildRequires: python-devel +BuildRequires: python, python-devel %description python Python extensions for Kamailio. @@ -862,8 +902,6 @@ XML operation functions for Kamailio. %package xmlrpc Summary: XMLRPC transport and encoding for Kamailio RPCs and MI commands Group: System Environment/Daemons -#Requires: libxml2, xmlrpc-c, kamailio = %ver -#BuildRequires: libxml2-devel, xmlrpc-c-devel Requires: libxml2, kamailio = %ver BuildRequires: libxml2-devel @@ -909,13 +947,15 @@ UUID module for Kamailio. ln -s ../obs pkg/kamailio/fedora/24 ln -s ../obs pkg/kamailio/fedora/25 ln -s ../obs pkg/kamailio/fedora/26 +ln -s ../obs pkg/kamailio/fedora/27 +ln -s ../obs pkg/kamailio/fedora/28 +ln -s ../obs pkg/kamailio/fedora/29 mkdir -p pkg/kamailio/rhel ln -s ../obs pkg/kamailio/rhel/6 ln -s ../obs pkg/kamailio/rhel/7 mkdir -p pkg/kamailio/opensuse ln -s ../obs pkg/kamailio/opensuse/1315 ln -s ../obs pkg/kamailio/opensuse/1330 -rm -Rf pkg/kamailio/centos mkdir -p pkg/kamailio/centos ln -s ../obs pkg/kamailio/centos/6 ln -s ../obs pkg/kamailio/centos/7

1 0

git:master:af66d5a1: modules: readme files regenerated - tm ... [skip ci]
by Kamailio Dev 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: af66d5a186e26a5ad612f2dd47ab24b8336ae03f URL: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-07T15:46:27+02:00 modules: readme files regenerated - tm ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… Patch: https://github.com/kamailio/kamailio/commit/af66d5a186e26a5ad612f2dd47ab24b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 511f95f792..d8c701df74 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -148,6 +148,7 @@ Daniel-Constantin Mierla 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -264,6 +265,7 @@ Daniel-Constantin Mierla 1.93. t_is_retr_async_reply usage 1.94. t_uac_send usage 1.95. event_route[tm:branch-failure] usage + 1.96. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -393,6 +395,7 @@ Chapter 1. Admin Guide 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -2943,6 +2946,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 6.1. event_route[tm:branch-failure] @@ -2967,6 +2971,18 @@ event_route[tm:branch-failure:myroute] { } ... +6.2. event_route[tm:local-response] + + Executed after the tm module has sent a local generated, transaction + stateful response. + + Example 1.96. event_route[tm:local-response] usage +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + 7. TM Module API 7.1. Defines

1 0

git:5.0:ab2681b0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.0 Commit: ab2681b0a2f1d9fbcecc3d8a99ea27bb79cfc05b URL: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-07T15:31:19+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tm/README --- Diff: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… Patch: https://github.com/kamailio/kamailio/commit/ab2681b0a2f1d9fbcecc3d8a99ea27b… --- diff --git a/src/modules/tm/README b/src/modules/tm/README index 25df50f72f..2bbf6cb2b8 100644 --- a/src/modules/tm/README +++ b/src/modules/tm/README @@ -143,6 +143,7 @@ Daniel-Constantin Mierla 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -257,6 +258,7 @@ Daniel-Constantin Mierla 1.91. t_is_retr_async_reply usage 1.92. t_uac_send usage 1.93. event_route[tm:branch-failure] usage + 1.94. event_route[tm:local-response] usage Chapter 1. Admin Guide @@ -381,6 +383,7 @@ Chapter 1. Admin Guide 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 7. TM Module API @@ -2870,6 +2873,7 @@ t_uac_send("OPTIONS", "sip:alice@kamailio.org", "", "", 6. Event Routes 6.1. event_route[tm:branch-failure] + 6.2. event_route[tm:local-response] 6.1. event_route[tm:branch-failure] @@ -2894,6 +2898,18 @@ event_route[tm:branch-failure:myroute] { } ... +6.2. event_route[tm:local-response] + + Executed after the tm module has sent a local generated, transaction + stateful response. + + Example 1.94. event_route[tm:local-response] usage +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + 7. TM Module API 7.1. Defines

1 0

git:5.1:b889ab44: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.1 Commit: b889ab44b07b134e8c180a0ce2c643dd1be01f18 URL: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:20:36+02:00 tm: document event_route[tm:local-response] (cherry picked from commit 17145075e77c7f962703ce401e879887a5717265) --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… Patch: https://github.com/kamailio/kamailio/commit/b889ab44b07b134e8c180a0ce2c643d… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

git:5.0:f84d1f3d: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: 5.0 Commit: f84d1f3deca9f7b5065c98505cee99c941200c7b URL: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:20:12+02:00 tm: document event_route[tm:local-response] (cherry picked from commit 17145075e77c7f962703ce401e879887a5717265) --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… Patch: https://github.com/kamailio/kamailio/commit/f84d1f3deca9f7b5065c98505cee99c… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

git:master:17145075: tm: document event_route[tm:local-response]
by Henning Westerholt 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: 17145075e77c7f962703ce401e879887a5717265 URL: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-07T15:18:35+02:00 tm: document event_route[tm:local-response] --- Modified: src/modules/tm/doc/event_routes.xml --- Diff: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… Patch: https://github.com/kamailio/kamailio/commit/17145075e77c7f962703ce401e87988… --- diff --git a/src/modules/tm/doc/event_routes.xml b/src/modules/tm/doc/event_routes.xml index f52f04fe9c..a85474d3f0 100644 --- a/src/modules/tm/doc/event_routes.xml +++ b/src/modules/tm/doc/event_routes.xml @@ -39,5 +39,22 @@ event_route[tm:branch-failure:myroute] { </programlisting> </example> </section> - + <section id="tm.e.local-response"> + <title> + <function moreinfo="none">event_route[tm:local-response]</function> + </title> + <para> + Executed after the tm module has sent a local generated, transaction stateful response. + </para> + <example> + <title><function>event_route[tm:local-response]</function> usage</title> + <programlisting format="linespecific"> +... +event_route[tm:local-response] { + xlog("tm:local-response replied locally\n"); +} +... + </programlisting> + </example> + </section> </section>

1 0

Event: Kamailio Developers Meeting, Sep 27-28, 2018, in Dusseldorf, Germany
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Kamailio SIP Server project is organizing a meeting of its developers during September 27-28, 2018, hosted by sipgate.de in Dusseldorf, Germany. The event is intended to facilitate the interaction between Kamailio developers and to offer a convenient environment for working together on several topics of high interest for the project, including writing code for Kamailio and its tools, improving documentation, or discuss about future development. Everyone from the community is welcome to join. Please note we have a limited capacity of 20 seats in the meeting room. Also, very important to be aware that this is not an event to learn how to use Kamailio. More details about the event, the venue, how to register, are available at: - https://www.kamailio.org/w/developers-meeting/ Looking forward to those two intensive hacking Kamailio days in Dusseldorf! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 1

git:master:1e67fdd5: tls: cast to usigned for computing available size for read
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: 1e67fdd53a1c6dc3964d25e891caad24029b7887 URL: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 tls: cast to usigned for computing available size for read --- Modified: src/modules/tls/tls_server.c --- Diff: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… Patch: https://github.com/kamailio/kamailio/commit/1e67fdd53a1c6dc3964d25e891caad2… --- diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index 7c66e3f550..1de6b94fda 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -1014,8 +1014,8 @@ int tls_read_f(struct tcp_connection* c, int* flags) * If it's != 0 is changed only on destroy. It's not possible to have * parallel reads.*/ tls_c = c->extra_data; - bytes_free = c->req.b_size - (int)(r->pos - r->buf); - if (unlikely(bytes_free == 0)) { + bytes_free = c->req.b_size - (unsigned int)(r->pos - r->buf); + if (unlikely(bytes_free <= 0)) { ERR("Buffer overrun, dropping\n"); r->error = TCP_REQ_OVERRUN; return -1;

1 0

git:master:db00d11d: core: tcp - more safety check to avoid jumping out if receive buf for ws proto
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: db00d11d6a30cb779cecfae73487de6d05b6b915 URL: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 core: tcp - more safety check to avoid jumping out if receive buf for ws proto --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6… Patch: https://github.com/kamailio/kamailio/commit/db00d11d6a30cb779cecfae73487de6…

1 0

git:master:da59f7a2: dmq: fixed KEMI export for handle_message() after last commit adding int param
by Daniel-Constantin Mierla 07 Sep '18

07 Sep '18

Module: kamailio Branch: master Commit: da59f7a2bb32b6c5995313249475207f9ca22790 URL: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-07T09:00:50+02:00 dmq: fixed KEMI export for handle_message() after last commit adding int param - new function handle_message_rc(...) exported to kemi --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… Patch: https://github.com/kamailio/kamailio/commit/da59f7a2bb32b6c5995313249475207… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index d28686da9c..4c772e1481 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -380,6 +380,11 @@ static sr_kemi_t sr_kemi_dmq_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dmq"), str_init("handle_message_rc"), + SR_KEMIP_INT, ki_dmq_handle_message_rc, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("dmq"), str_init("is_from_node"), SR_KEMIP_INT, is_from_remote_node, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 2293cc3600..bce42d6ffd 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg, int returnval) +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -73,6 +73,12 @@ int ki_dmq_handle_message(sip_msg_t *msg, int returnval) return -1; } + +int ki_dmq_handle_message(sip_msg_t *msg) +{ + return ki_dmq_handle_message_rc(msg, 0); +} + int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { int i = 0; @@ -80,10 +86,10 @@ int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; } if(i>1) i = 1; - return ki_dmq_handle_message(msg, i); + return ki_dmq_handle_message_rc(msg, i); } int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg, 0); + return ki_dmq_handle_message_rc(msg, 0); } diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 9c9f835745..d47e421c6e 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -26,6 +26,7 @@ int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg, int returnval); +int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message_rc(sip_msg_t *msg, int returnval); #endif

1 0

git:master:b80400e5: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: b80400e59aa4ef0e148335e3532ff33f7b371904 URL: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T15:46:29+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33… Patch: https://github.com/kamailio/kamailio/commit/b80400e59aa4ef0e148335e3532ff33…

4 4

git:master:66245384: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 66245384f4598350699228249c7e79e37d30a5ff URL: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T16:16:23+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e… Patch: https://github.com/kamailio/kamailio/commit/66245384f4598350699228249c7e79e…

1 0

git:master:6bb63e2a: rtpengine: fix docs xml (broken in e528fce)
by Richard Fuchs 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 6bb63e2a59b795d19b24acc67adb9335c6abd363 URL: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T10:07:10-04:00 rtpengine: fix docs xml (broken in e528fce) --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… Patch: https://github.com/kamailio/kamailio/commit/6bb63e2a59b795d19b24acc67adb933… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index bb85885183..15449dbe19 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2613,6 +2613,7 @@ block_dtmf(); </title> <para> Reverses the effects of a previously issued <function>block_dtmf</function> call. + </para> <example> <title><function>unblock_dtmf</function> usage</title> <programlisting format="linespecific">

1 0

git:master:e528fce4: rtpengine: add block_dtmf and unblock_dtmf
by Richard Fuchs 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: e528fce4b61112f78b0081fcb0d53ef440cafce7 URL: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-09-06T09:40:14-04:00 rtpengine: add block_dtmf and unblock_dtmf --- Modified: src/modules/rtpengine/doc/rtpengine.xml Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef… Patch: https://github.com/kamailio/kamailio/commit/e528fce4b61112f78b0081fcb0d53ef…

1 0

git:master:4625c750: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 4625c7509e60a087389d22267c8cc10595593a54 URL: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T13:16:28+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… Patch: https://github.com/kamailio/kamailio/commit/4625c7509e60a087389d22267c8cc10… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 733e0a8109..90faef20ac 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1469,6 +1469,8 @@ kamcmd dispatcher.ping_active 0 type). * 'socket' - used to set the sending socket for the gateway. It is used for sending the SIP traffic as well as OPTIONS keepalives. + * 'ping_from' - used to set the From URI in OPTIONS keepalives. It + overwrites the general ds_ping_from parameter. 6.1.2. File Format @@ -1479,7 +1481,8 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) Full line example: ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from +=sip:myproxy.com ... For database, each element of a line resides in a different column. @@ -1523,7 +1526,7 @@ r,opt) # - web: http://www.kamailio.org # - git: http://github.com/kamailio/ # -# Direct your questions about this file to: sr-users(a)lists.sip-router.org +# Direct your questions about this file to: sr-users(a)lists.kamailio.org # # Refer to the Core CookBook at http://www.kamailio.org/dokuwiki/doku.php # for an explanation of possible statements, functions and parameters. @@ -1584,11 +1587,12 @@ sip_warning=no ####### Modules Section ######## # set module path -mpath="/usr/local/lib/kamailio/modules/" +#mpath="/usr/local/lib/kamailio/modules/" loadmodule "db_mysql.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" +loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" @@ -1671,8 +1675,9 @@ request_route { # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) + if (is_method("INVITE|SUBSCRIBE")) { record_route(); + } # account only INVITEs if (is_method("INVITE")) { @@ -1757,6 +1762,7 @@ gnore and discard. route[REGISTRAR] { if(!is_method("REGISTER")) return; + sl_send_reply("404", "No registrar"); exit; }

1 0

git:master:8a64560e: Merge pull request #1636 from kamailio/gv/ds_ping_from
by GitHub 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 8a64560e1037afe723dbd8c3c26ce198258f35fb URL: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:15:00+02:00 Merge pull request #1636 from kamailio/gv/ds_ping_from dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… Patch: https://github.com/kamailio/kamailio/commit/8a64560e1037afe723dbd8c3c26ce19… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

1 0

git:master:3f9c38be: dispatcher: add ping_from attribute
by Giacomo Vacca 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 3f9c38be11416f7abe5c4448088ba66d2d3e6aad URL: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Author: Giacomo Vacca <giacomo.vacca(a)gmail.com> Committer: Giacomo Vacca <giacomo.vacca(a)gmail.com> Date: 2018-09-05T14:35:52+02:00 dispatcher: add ping_from attribute --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… Patch: https://github.com/kamailio/kamailio/commit/3f9c38be11416f7abe5c4448088ba66… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index cb87392eb8..0422cd6b20 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -300,6 +300,9 @@ int ds_set_attrs(ds_dest_t *dest, str *vattrs) } else { LM_ERR("rweight %d not in 1-100 range; skipped", tmp_rweight); } + } else if(pit->name.len == 9 + && strncasecmp(pit->name.s, "ping_from", 9) == 0) { + dest->attrs.ping_from = pit->body; } } if(params_list) @@ -3020,6 +3023,7 @@ void ds_ping_set(ds_set_t *node) { uac_req_t uac_r; int i, j; + str ping_from; if(!node) return; @@ -3051,10 +3055,21 @@ void ds_ping_set(ds_set_t *node) uac_r.ssock = &ds_default_socket; } + /* Overwrite default ping From URI with attribute */ + if(node->dlist[j].attrs.ping_from.s != NULL + && node->dlist[j].attrs.ping_from.len > 0) { + ping_from = node->dlist[j].attrs.ping_from; + LM_DBG("ping_from: %.*s\n", ping_from.len, ping_from.s); + } + else { + ping_from = ds_ping_from; + LM_DBG("Default ping_from: %.*s\n", ping_from.len, ping_from.s); + } + gettimeofday(&node->dlist[j].latency_stats.start, NULL); if(tmb.t_request(&uac_r, &node->dlist[j].uri, &node->dlist[j].uri, - &ds_ping_from, &ds_outbound_proxy) + &ping_from, &ds_outbound_proxy) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 7845616714..7a798fc162 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -169,6 +169,7 @@ typedef struct _ds_attrs { int weight; int rweight; int congestion_control; + str ping_from; } ds_attrs_t; typedef struct _ds_latency_stats { diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index b113b284fd..b409c5208d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1829,6 +1829,10 @@ onreply_route { It is used for sending the SIP traffic as well as OPTIONS keepalives. </listitem> + <listitem> + 'ping_from' - used to set the From URI in OPTIONS keepalives. + It overwrites the general ds_ping_from parameter. + </listitem> </itemizedlist> </para> </section> @@ -1848,7 +1852,7 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) </para> <programlisting format="linespecific"> ... -1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz +1 sip:127.0.0.1:5080 0 0 duid=abc;socket=udp:192.168.0.125:5060;my=xyz;ping_from=sip:myproxy.com ... </programlisting>

1 0

[kamailio/kamailio] dispatcher: add ping_from attribute (#1636)
by Giacomo Vacca 06 Sep '18

06 Sep '18

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  I was looking for a solution to set a dedicated From URI in OPTIONS requests to a specific dispatcher target. ds_ping_from ( https://www.kamailio.org/docs/modules/devel/modules/dispatcher.html#dispatc…) applies globally, while I needed the granularity of a single target. I can just add an attribute to the others, e.g. instead of ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ``` something like: ``` 1 sip:127.0.0.1:7070 <http://127.0.0.1:7070> 0 1 ping_from=sip.custom.com ``` When the ping_from attribute is not specified, the general ds_ping_from applies and is used. This would save me from a solution like intercepting the outgoing OPTIONS and manipulating the From header. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1636 -- Commit Summary -- * dispatcher: add ping_from attribute -- File Changes -- M src/modules/dispatcher/dispatch.c (17) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/doc/dispatcher_admin.xml (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1636.patch https://github.com/kamailio/kamailio/pull/1636.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/1636

2 2

git:5.1:216f8de9: Merge pull request #1637 from sergey-safarov/spec_update
by GitHub 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: 216f8de9cac6d611f6465ff007afa0bfdfe626ca URL: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-06T13:00:27+02:00 Merge pull request #1637 from sergey-safarov/spec_update [5.1] pkg/docker: Updated submodule --- Added: pkg/kamailio/Makefile Added: pkg/kamailio/README.md Modified: pkg/docker Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b… Patch: https://github.com/kamailio/kamailio/commit/216f8de9cac6d611f6465ff007afa0b…

1 0

git:5.1:cd573038: pkg/kamailio/alpine: Added function to build package from local git tree
by Sergey Safarov 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: cd5730389d74b3cafbfa04d73b17fe2dd7121b8e URL: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T09:15:51Z pkg/kamailio/alpine: Added function to build package from local git tree (cherry picked from commit c9b3ed04a7ab49cbc2063b44f66f50366d7a3ba5) Copied from master: pkg/kamailio/Makefile pkg/kamailio/README.md --- Added: pkg/kamailio/Makefile Added: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2… Patch: https://github.com/kamailio/kamailio/commit/cd5730389d74b3cafbfa04d73b17fe2…

1 0

git:5.1:6783a660: pkg/docker: Updated submodule
by Sergey Safarov 06 Sep '18

06 Sep '18

Module: kamailio Branch: 5.1 Commit: 6783a660ef658d82495a7176fe9d5fa03f3f23e0 URL: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-06T09:18:01Z pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… Patch: https://github.com/kamailio/kamailio/commit/6783a660ef658d82495a7176fe9d5fa… --- diff --git a/pkg/docker b/pkg/docker index 9f04def504..5e6a821c3a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75 +Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15

1 0

[kamailio/kamailio] [5.1] pkg/docker: Updated submodule (#1637)
by sergey-safarov 06 Sep '18

06 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1637 -- Commit Summary -- * pkg/kamailio/alpine: Added function to build package from local git tree * pkg/docker: Updated submodule -- File Changes -- M pkg/docker (2) A pkg/kamailio/Makefile (54) A pkg/kamailio/README.md (89) M pkg/kamailio/alpine/APKBUILD (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1637.patch https://github.com/kamailio/kamailio/pull/1637.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/1637

2 1

git:master:8d4653cc: tls: tls.cfg - more sample tls domain profiles
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 8d4653cc2e0113bcec4397657e27b8c19b1849a7 URL: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T12:57:56+02:00 tls: tls.cfg - more sample tls domain profiles - small edits to explanatory comments --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… Patch: https://github.com/kamailio/kamailio/commit/8d4653cc2e0113bcec4397657e27b8c… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index dd25abd4ac..b84ba8fcfc 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -2,8 +2,9 @@ # Example Kamailio TLS Configuration File # -# This is the default server domain, settings -# in this domain will be used for all incoming +# --- +# This is the default server domain profile. +# Settings in this domain will be used for all incoming # connections that do not match any other server # domain in this configuration file. # @@ -20,8 +21,9 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem #ca_list = /usr/local/etc/kamailio/tls/cacert.pem #crl = /usr/local/etc/kamailio/tls/crl.pem -# This is the default client domain, settings -# in this domain will be used for all outgoing +# --- +# This is the default client domain profile. +# Settings in this domain will be used for all outgoing # TLS connections that do not match any other # client domain in this configuration file. # We require that servers present valid certificate. @@ -31,6 +33,7 @@ certificate = /usr/local/etc/kamailio/kamailio-selfsigned.pem verify_certificate = yes require_certificate = yes +# --- # This is an example server domain for TLS connections # received from the loopback interface. We allow # the use of TLSv1 protocols here, we do @@ -46,11 +49,12 @@ require_certificate = yes #private_key = /usr/local/etc/kamailio/tls/local_key.pem #certificate = /usr/local/etc/kamailio/tls/local_cert.pem #verify_depth = 3 -#ca_list = local_ca.pem -#crl = local_crl.pem +#ca_list = /usr/local/etc/kamailio/tls/local_ca.pem +#crl = /usr/local/etc/kamailio/tls/local_crl.pem #server_name = kamailio.org #server_id = kamailio.org +# --- # Special settings for connecting to the example.sip (1.2.3.4) # public SIP server. We do not verify the certificate of the # server because it can be expired. The server @@ -60,9 +64,43 @@ require_certificate = yes # #[client:1.2.3.4:5061] #verify_certificate = no -#certificate = /usr/local/etc/kamailio/tls/example_client.pem #private_key = /usr/local/etc/kamailio/tls/example_key.pem +#certificate = /usr/local/etc/kamailio/tls/example_cert.pem #ca_list = /usr/local/etc/kamailio/tls/example_ca.pem #crl = /usr/local/etc/kamailio/tls/example_crl.pem #server_name = example.sip #server_id = example.sip + +# --- +# Example server profile for listening on any ip/port +# - it requires to have 'server_name' to match on SNI (domain and subdomains) +# +#[server:any] +#method = TLSv1 +#verify_certificate = yes +#require_certificate = no +#private_key = /usr/local/etc/kamailio/tls/mysipserver_org_key.pem +#certificate = /usr/local/etc/kamailio/tls/mysipserver_org_cert.pem +#verify_depth = 3 +#ca_list = /usr/local/etc/kamailio/tls/mysipserver_org_ca.pem +#crl = /usr/local/etc/kamailio/tls/mysipserver_org_crl.pem +#server_name = mysipserver.org +#server_name_mode = 1 +#server_id = mysipserver.org + +# --- +# Example server profile for listening on any ip/port +# - it requires to have 'server_name' to match on SNI (only subdomains) +# +#[server:any] +#method = TLSv1 +#verify_certificate = yes +#require_certificate = no +#private_key = /usr/local/etc/kamailio/tls/mysipserver_net_key.pem +#certificate = /usr/local/etc/kamailio/tls/mysipserver_net_cert.pem +#verify_depth = 3 +#ca_list = /usr/local/etc/kamailio/tls/mysipserver_net_ca.pem +#crl = /usr/local/etc/kamailio/tls/mysipserver_net_crl.pem +#server_name = mysipserver.net +#server_name_mode = 2 +#server_id = mysipserver.net

1 0

git:master:d008a559: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: d008a559e00d161c0e2415d6dbbcd88c9349357b URL: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-06T11:31:38+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88… Patch: https://github.com/kamailio/kamailio/commit/d008a559e00d161c0e2415d6dbbcd88…

1 0

git:master:ae17309b: tls: docs - more details about content of tls.cfg
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: ae17309bf9f9866c469547971c3853b5c677f434 URL: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T11:21:51+02:00 tls: docs - more details about content of tls.cfg --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b… Patch: https://github.com/kamailio/kamailio/commit/ae17309bf9f9866c469547971c3853b…

1 0

git:master:14b27ed9: tls: check tls domain cfg duplication after parsing all attributes
by Daniel-Constantin Mierla 06 Sep '18

06 Sep '18

Module: kamailio Branch: master Commit: 14b27ed9377c62df4fa9f230b9aa9490fea98294 URL: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-06T10:03:21+02:00 tls: check tls domain cfg duplication after parsing all attributes - allows definition of domain profiles with same address but different server_name (SNI) --- Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949… Patch: https://github.com/kamailio/kamailio/commit/14b27ed9377c62df4fa9f230b9aa949…

1 0

[kamailio/kamailio] pkg/kamailio: Updated RPM spec file (#1633)
by sergey-safarov 05 Sep '18

05 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1633 -- Commit Summary -- * pkg/kamailio: Updated RPM spec file -- File Changes -- M pkg/kamailio/obs/kamailio.spec (89) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1633.patch https://github.com/kamailio/kamailio/pull/1633.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/1633

2 2

git:master:1180b17e: Merge pull request #1633 from sergey-safarov/spec_update
by GitHub 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 1180b17ebd847455e52399341cdb724d6c9241e5 URL: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-05T19:14:10+02:00 Merge pull request #1633 from sergey-safarov/spec_update pkg/kamailio: Updated RPM spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724… Patch: https://github.com/kamailio/kamailio/commit/1180b17ebd847455e52399341cdb724…

1 0

git:master:8b3c399a: pkg/kamailio: Updated RPM spec file
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 8b3c399a27e6c7deed978d3b74bda4fc066f6540 URL: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T19:30:37Z pkg/kamailio: Updated RPM spec file --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f… Patch: https://github.com/kamailio/kamailio/commit/8b3c399a27e6c7deed978d3b74bda4f…

1 0

[kamailio/kamailio] pkg/docker: Updated subproject (#1630)
by sergey-safarov 05 Sep '18

05 Sep '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1630 -- Commit Summary -- * pkg/docker: Updated subproject -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1630.patch https://github.com/kamailio/kamailio/pull/1630.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/1630

2 2

git:master:4ce701bd: Merge pull request #1630 from sergey-safarov/master
by GitHub 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 4ce701bd910f516b5668e5068ee20e88b5fbf881 URL: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-09-05T19:13:45+02:00 Merge pull request #1630 from sergey-safarov/master pkg/docker: Updated subproject --- Modified: pkg/docker Modified: pkg/kamailio/Makefile Modified: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8… Patch: https://github.com/kamailio/kamailio/commit/4ce701bd910f516b5668e5068ee20e8…

1 0

git:master:76087baf: pkg/docker: Updated submodule
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 76087baf7bc2e71f226da859bd938f13db4ad814 URL: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T21:55:59Z pkg/docker: Updated submodule --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… Patch: https://github.com/kamailio/kamailio/commit/76087baf7bc2e71f226da859bd938f1… --- diff --git a/pkg/docker b/pkg/docker index 9f04def504..5e6a821c3a 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 9f04def504051dc8da3989b1f96e4b6633d31a75 +Subproject commit 5e6a821c3ab9b4c07729daa49ce2c6eb17ddbc15

1 0

git:master:c9b3ed04: pkg/kamailio/alpine: Added function to build package from local git tree
by Sergey Safarov 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: c9b3ed04a7ab49cbc2063b44f66f50366d7a3ba5 URL: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-09-02T21:55:56Z pkg/kamailio/alpine: Added function to build package from local git tree --- Modified: pkg/kamailio/Makefile Modified: pkg/kamailio/README.md Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503… Patch: https://github.com/kamailio/kamailio/commit/c9b3ed04a7ab49cbc2063b44f66f503…

1 0

[kamailio/kamailio] Bug in tls #1491 (#1635)
by Prabhat Kumar 05 Sep '18

05 Sep '18

Kamailio version 5.1 ubuntu os 16.04 i have installed all the dependencies. when i am starting kamailio service i get this error sudo service kamailio status ● kamailio.service - LSB: Start the Kamailio SIP proxy server Loaded: loaded (/etc/init.d/kamailio; bad; vendor preset: enabled) Active: active (exited) since Wed 2018-09-05 12:40:48 UTC; 12min ago Docs: man:systemd-sysv-generator(8) Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: WARNING: tls [tls_init.c:778]: init_tls_h(): **openssl bug #1491 (crash/mem leaks on low memory)** wo Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold1 has been changed to Sep 05 12:40:48 ip-10-0-0-45 /usr/local/sbin/kamailio[2553]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold2 has been changed to Sep 05 12:40:48 ip-10-0-0-45 kamailio[2532]: * already running Sep 05 12:40:48 ip-10-0-0-45 kamailio[2532]: ...done. Sep 05 12:40:48 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:43:35 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:43:50 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:44:28 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. Sep 05 12:48:39 ip-10-0-0-45 systemd[1]: Started LSB: Start the Kamailio SIP proxy server. -- 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/1635

3 7

git:master:7dbe407d: tls: added server_name_mode attribute for tls domain profiles
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 7dbe407d31c0dbf9c1bb69d1fd11b8e7607c9766 URL: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T14:59:37+02:00 tls: added server_name_mode attribute for tls domain profiles - define how to match server_name (SNI): * 0 - match only the domain * 1 - match the domain and subdomains * 2 - match only the subdomains --- Modified: src/modules/tls/tls_cfg.c Modified: src/modules/tls/tls_cfg.h Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e… Patch: https://github.com/kamailio/kamailio/commit/7dbe407d31c0dbf9c1bb69d1fd11b8e…

1 0

git:master:6cfc6087: tls: allow defining a tls profile (domain) for any address
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 6cfc60875063b9c75ef3a09d879e0e47b92935ea URL: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T13:01:19+02:00 tls: allow defining a tls profile (domain) for any address - token 'any' or 'all' can be used instead of the address [server:any] or [client:any] - useful when the IP address/port to listen on is not known upfront or many addresses are used to listen on - such profiles can be defined many times and must have server_name attribute (for SNI) --- Modified: src/modules/tls/tls_config.c Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_domain.h --- Diff: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4… Patch: https://github.com/kamailio/kamailio/commit/6cfc60875063b9c75ef3a09d879e0e4…

1 0

git:master:2fc11f18: core: tcp - improved safety check for available byte in tcp read buffer
by Daniel-Constantin Mierla 05 Sep '18

05 Sep '18

Module: kamailio Branch: master Commit: 2fc11f183d8fcedeb35559c5236ad7159a6a5864 URL: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-05T11:48:02+02:00 core: tcp - improved safety check for available byte in tcp read buffer --- Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… Patch: https://github.com/kamailio/kamailio/commit/2fc11f183d8fcedeb35559c5236ad71… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 0dc7838df8..6bb52745a4 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -356,7 +356,7 @@ int tcp_read(struct tcp_connection *c, int* flags) fd=c->fd; bytes_free=r->b_size- (int)(r->pos - r->buf); - if (unlikely(bytes_free==0)){ + if (unlikely(bytes_free<=0)){ LM_ERR("buffer overrun, dropping ([%s]:%u -> [%s]:%u)\n", ip_addr2a(&c->rcv.src_ip), c->rcv.src_port, ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);

1 0

git:5.0:247fd141: core: parse via - set len for host/port_str only if there is a value
by Henning Westerholt 04 Sep '18

04 Sep '18

Module: kamailio Branch: 5.0 Commit: 247fd14179d7e69020f8c52f824b314fa7e2fef7 URL: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-04T21:50:56+02:00 core: parse via - set len for host/port_str only if there is a value (cherry picked from commit 8cebf48eeee70d23c6cf827e24b2f5fabda669ab) --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… Patch: https://github.com/kamailio/kamailio/commit/247fd14179d7e69020f8c52f824b314… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index eb4c84bcf2..2207b45b38 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:5.1:e747a538: core: parse via - set len for host/port_str only if there is a value
by Henning Westerholt 04 Sep '18

04 Sep '18

Module: kamailio Branch: 5.1 Commit: e747a538ea50086d01f100726ba36eff99268803 URL: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-09-04T21:50:43+02:00 core: parse via - set len for host/port_str only if there is a value (cherry picked from commit 8cebf48eeee70d23c6cf827e24b2f5fabda669ab) --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… Patch: https://github.com/kamailio/kamailio/commit/e747a538ea50086d01f100726ba36ef… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 8c3d54ea5e..318bb8e6c6 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:master:1262884a: pv: added transformation {s.unbracket}
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 1262884a47719fd0349a9ce8553d70e167d5b05a URL: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T18:55:20+02:00 pv: added transformation {s.unbracket} - return value without surrounding (), [], {} or <> --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… Patch: https://github.com/kamailio/kamailio/commit/1262884a47719fd0349a9ce8553d70e… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 79e31a9ded..a515393869 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1180,6 +1180,32 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs.s[val->rs.len] = '\0'; break; + case TR_S_UNBRACKET: + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + break; + } + if(val->rs.len<2) { + break; + } + if(val->rs.len>TR_BUFFER_SIZE-2) { + LM_ERR("value too large: %d\n", val->rs.len); + return -1; + } + if((val->rs.s[0] == '(' && val->rs.s[val->rs.len-1] == ')') + || (val->rs.s[0] == '[' && val->rs.s[val->rs.len-1] == ']') + || (val->rs.s[0] == '{' && val->rs.s[val->rs.len-1] == '}') + || (val->rs.s[0] == '<' && val->rs.s[val->rs.len-1] == '>')) { + memcpy(_tr_buffer, val->rs.s+1, val->rs.len-2); + val->rs.len -= 2; + } else { + memcpy(_tr_buffer, val->rs.s, val->rs.len); + } + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2535,6 +2561,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==7 && strncasecmp(name.s, "unquote", 7)==0) { t->subtype = TR_S_UNQUOTE; goto done; + } else if(name.len==9 && strncasecmp(name.s, "unbracket", 9)==0) { + t->subtype = TR_S_UNBRACKET; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index ca24a3c108..da2cb87624 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,8 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE, + TR_S_UNBRACKET }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

git:master:74f95d90: app_jsdt: fixed typo in exporting KSR.pv.getvs(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 74f95d902d43e6eb7c3af42d2d4fcb5fd029c28b URL: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T17:25:00+02:00 app_jsdt: fixed typo in exporting KSR.pv.getvs(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… Patch: https://github.com/kamailio/kamailio/commit/74f95d902d43e6eb7c3af42d2d4fcb5… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 414f20732d..7af7f91b9d 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -528,7 +528,7 @@ const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "gete", jsdt_sr_pv_gete, 1 /* 1 args */ }, { "getvn", jsdt_sr_pv_getvn, 2 /* 2 args */ }, - { "getvd", jsdt_sr_pv_getvs, 2 /* 2 args */ }, + { "getvs", jsdt_sr_pv_getvs, 2 /* 2 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

git:master:1891c312: app_jsdt: exported KSR.pv_getvn(...) and KSR.pv.getvs(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 1891c31204d59dd2270d8ea925259578145dc8f6 URL: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T15:56:43+02:00 app_jsdt: exported KSR.pv_getvn(...) and KSR.pv.getvs(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… Patch: https://github.com/kamailio/kamailio/commit/1891c31204d59dd2270d8ea92525957… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 9b6dda8472..414f20732d 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -239,6 +239,102 @@ static int jsdt_sr_pv_gete(duk_context *J) return jsdt_sr_pv_get_mode(J, 2); } +/** + * + */ +static int jsdt_sr_pv_push_valx (duk_context *J, int rmode, int vi, str *vs) +{ + if(rmode==1) { + duk_push_int(J, vi); + } else { + duk_push_lstring(J, vs->s, vs->len); + } + return 1; +} + +/** + * + */ +static int jsdt_sr_pv_get_valx (duk_context *J, int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + sr_jsdt_env_t *env_J; + int pl; + int xival = 0; + str xsval = str_init(""); + env_J = jsdt_sr_env_get(); + + if(duk_get_top(J)<2) { + LM_ERR("too few parameters [%d]\n", duk_get_top(J)); + return jsdt_sr_return_pv_null(J, 0); + } + if(rmode==1) { + if(!duk_is_number(J, 1)) { + LM_ERR("invalid int parameter\n"); + return jsdt_sr_return_pv_null(J, 0); + } + xival = duk_to_int(J, 1); + } else { + if(!duk_is_string(J, 1)) { + LM_ERR("invalid str parameter\n"); + return jsdt_sr_return_pv_null(J, 0); + } + xsval.s = (char*)duk_to_string(J, 1); + xsval.len = strlen(val.rs.s); + } + + pvn.s = (char*)duk_to_string(J, 0); + if(pvn.s==NULL || env_J->msg==NULL) { + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + + pvn.len = strlen(pvn.s); + LM_DBG("pv get: %s\n", pvn.s); + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { + LM_ERR("unable to get pv value for [%s]\n", pvn.s); + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return jsdt_sr_pv_push_valx(J, rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + duk_push_int(J, val.ri); + return 1; + } + duk_push_lstring(J, val.rs.s, val.rs.len); + return 1; +} + +/** + * + */ +static int jsdt_sr_pv_getvs (duk_context *J) +{ + return jsdt_sr_pv_get_valx(J, 0); +} + +/** + * + */ +static int jsdt_sr_pv_getvn (duk_context *J) +{ + return jsdt_sr_pv_get_valx(J, 1); +} + /** * */ @@ -431,6 +527,8 @@ const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, { "gete", jsdt_sr_pv_gete, 1 /* 1 args */ }, + { "getvn", jsdt_sr_pv_getvn, 2 /* 2 args */ }, + { "getvd", jsdt_sr_pv_getvs, 2 /* 2 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

[kamailio/kamailio] passing argument to event_callback function (#1627)
by Surendra Tiwari 04 Sep '18

04 Sep '18

### Description Right Now, There is no way to pass the parameter to event_callback function to be executed by KEMI Interpreter. This is required when we have to pass call_uuid for async call without suspending transaction. In callback we don't have anything refer to the previous transaction. ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions We need to introduce parameter to event_callback with ; Initially let's keep it to only single parameter.  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@ip-172-31-3-45:~# kamailio -v version: kamailio 5.1.3 (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 15:16:50 Apr 24 2018 with gcc 4.8.4 ``` * **Operating System**:  ``` root@ip-172-31-3-45:~# uname -a Linux ip-172-31-3-45 3.13.0-143-generic #192-Ubuntu SMP Tue Feb 27 10:45:36 UTC 2018 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/1627

2 3

[kamailio/kamailio] undefined symbol: SHA1 (#1634)
by Prabhat Kumar 04 Sep '18

04 Sep '18

when i run command "kamailio -c kamailio.cfg" I get this error.. loading modules under config path: /usr/lib/x86_64-linux-gnu/kamailio/modules/ 0(12737) ERROR: <core> [sr_module.c:576]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/websocket.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/websocket.so: undefined symbol: SHA1 I tried reinstalling websocket modules but its not working. -- 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/1634

2 4

git:master:d453bdd3: tcpops: more debug messages when executing event route
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: d453bdd36a6cd569978a1d19e41d55b28c2b4e13 URL: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:52:58+02:00 tcpops: more debug messages when executing event route --- Modified: src/modules/tcpops/tcpops.c --- Diff: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… Patch: https://github.com/kamailio/kamailio/commit/d453bdd36a6cd569978a1d19e41d55b… --- diff --git a/src/modules/tcpops/tcpops.c b/src/modules/tcpops/tcpops.c index 8e5605c514..6815bf4897 100644 --- a/src/modules/tcpops/tcpops.c +++ b/src/modules/tcpops/tcpops.c @@ -204,6 +204,7 @@ static void tcpops_tcp_closed_run_route(tcp_closed_event_info_t *tev) sip_msg_t *fmsg; rt = tcp_closed_routes[tev->reason]; + LM_DBG("event reason id: %d rt: %d\n", tev->reason, rt); if (rt == -1) return; if (faked_msg_init() < 0) @@ -229,11 +230,13 @@ int tcpops_handle_tcp_closed(sr_event_param_t *evp) LM_WARN("received bad TCP closed event\n"); return -1; } + LM_DBG("received TCP closed event\n"); /* run event route if tcp_closed_event == 1 or if the * F_CONN_CLOSE_EV flag is explicitly set */ - if (tcp_closed_event == 1 || (tev->con->flags & F_CONN_CLOSE_EV)) + if (tcp_closed_event == 1 || (tev->con->flags & F_CONN_CLOSE_EV)) { tcpops_tcp_closed_run_route(tev); + } return 0; }

1 0

git:master:be55865f: modules: readme files regenerated - htable ... [skip ci]
by Kamailio Dev 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: be55865fb2601cc9141d6f3fb5ad0affd7507102 URL: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-04T11:31:32+02:00 modules: readme files regenerated - htable ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… Patch: https://github.com/kamailio/kamailio/commit/be55865fb2601cc9141d6f3fb5ad0af… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 2d393d8761..1fd1fbdf5b 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -68,6 +68,8 @@ Ovidiu Sas 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -117,6 +119,8 @@ Ovidiu Sas 1.27. sht_iterator_start usage 1.28. sht_iterator_end usage 1.29. sht_iterator_next usage + 1.30. sht_has_name usage + 1.31. sht_has_name usage Chapter 1. Admin Guide @@ -160,6 +164,8 @@ Chapter 1. Admin Guide 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 5. Exported pseudo-variables 6. RPC Commands @@ -675,6 +681,8 @@ modparam("htable", "event_callback_mode", 1) 4.9. sht_iterator_start(iname, hname) 4.10. sht_iterator_end(iname) 4.11. sht_iterator_next(iname) + 4.12. sht_has_name(htable, op, mval) + 4.13. sht_has_str_value(htable, op, mval) 4.1. sht_print() @@ -852,6 +860,50 @@ sht_iterator_end("i1"); sht_iterator_end("i1"); ... +4.12. sht_has_name(htable, op, mval) + + Return greater than 0 (true) if the htable has an item that matches the + name against the mval parameter. + + The op parameter can be: + * eq - match the val parameter as string equal expression. + * ne - match the val parameter as string not-equal expression. + * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with' expression. + + All parameters can be static strings or contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.30. sht_has_name usage +... +if(sht_has_name("ha", "eq", "alice")) { + ... +} +... + +4.13. sht_has_str_value(htable, op, mval) + + Return greater than 0 (true) if the htable has an item that matches the + string value against the mval parameter. + + The op parameter can be: + * eq - match the val parameter as string equal expression. + * ne - match the val parameter as string not-equal expression. + * re - match the val parameter as regular expression. + * sw - match the val parameter as 'starts with' expression. + + All parameters can be static strings or contain variables. + + This function can be used from ANY_ROUTE. + + Example 1.31. sht_has_name usage +... +if(sht_has_str_value("ha", "eq", "alice")) { + ... +} +... + 5. Exported pseudo-variables * $sht(htable=>key)

1 0

git:master:dec17cb6: htable: proper return on match for sw operator whith rm functions
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: dec17cb6af275789c4ae804d5e1004a9f77010a3 URL: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:25:21+02:00 htable: proper return on match for sw operator whith rm functions --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… Patch: https://github.com/kamailio/kamailio/commit/dec17cb6af275789c4ae804d5e1004a… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 4070bf7b74..214b6e3608 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -489,6 +489,7 @@ static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, if(ht_rm_cell_op(val, ht, mkey, HT_RM_OP_SW)<0) { return -1; } + return 1; } LM_WARN("unsupported match operator: %.*s\n", op->len, op->s); break;

1 0

git:master:232c541a: htable: docs for sht_has_name(...) and sht_has_str_value(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 232c541ab6a084011380d94569215d599725e588 URL: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:12:16+02:00 htable: docs for sht_has_name(...) and sht_has_str_value(...) --- Modified: src/modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… Patch: https://github.com/kamailio/kamailio/commit/232c541ab6a084011380d94569215d5… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 00f7a6eb41..6a8492a94e 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -1026,6 +1026,114 @@ sht_iterator_end("i1"); } sht_iterator_end("i1"); ... +</programlisting> + </example> + </section> + <section id="htable.f.sht_has_name"> + <title> + <function moreinfo="none">sht_has_name(htable, op, mval)</function> + </title> + <para> + Return greater than 0 (true) if the htable has an item that matches + the name against the mval parameter. + </para> + <para> + The op parameter can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>eq</emphasis> - match the val parameter as string equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>ne</emphasis> - match the val parameter as string not-equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>re</emphasis> - match the val parameter as regular + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with' expression. + </para> + </listitem> + </itemizedlist> + <para> + All parameters can be static strings or contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_has_name</function> usage</title> + <programlisting format="linespecific"> +... +if(sht_has_name("ha", "eq", "alice")) { + ... +} +... +</programlisting> + </example> + </section> + <section id="htable.f.sht_has_str_value"> + <title> + <function moreinfo="none">sht_has_str_value(htable, op, mval)</function> + </title> + <para> + Return greater than 0 (true) if the htable has an item that matches + the string value against the mval parameter. + </para> + <para> + The op parameter can be: + </para> + <itemizedlist> + <listitem> + <para> + <emphasis>eq</emphasis> - match the val parameter as string equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>ne</emphasis> - match the val parameter as string not-equal + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>re</emphasis> - match the val parameter as regular + expression. + </para> + </listitem> + <listitem> + <para> + <emphasis>sw</emphasis> - match the val parameter as 'starts + with' expression. + </para> + </listitem> + </itemizedlist> + <para> + All parameters can be static strings or contain variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sht_has_name</function> usage</title> + <programlisting format="linespecific"> +... +if(sht_has_str_value("ha", "eq", "alice")) { + ... +} +... </programlisting> </example> </section>

1 0

git:master:37eb8b00: htable: new functions sht_has_name(...) and sht_has_str_value(...)
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 37eb8b00c22da64df3d9f38645354af19c407bf5 URL: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T11:04:59+02:00 htable: new functions sht_has_name(...) and sht_has_str_value(...) - sht_has_name(htable, op, mval) - return >0 if there is an item matching its name with mval based on operator op - sht_has_str_valye(htable, op, mval) - return >0 if there is an item matching its string value with mval based on operator op --- Modified: src/modules/htable/ht_api.c Modified: src/modules/htable/ht_api.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af… Patch: https://github.com/kamailio/kamailio/commit/37eb8b00c22da64df3d9f38645354af…

1 0

[kamailio/kamailio] KEMI: add htable's sht_rm_* functions (#1614)
by Enrico Bandiera 04 Sep '18

04 Sep '18

Hi, currently htable module's sht_rm_* functions are not exported to KEMI, could anyone please export them to KEMI? Thanks, Enrico -- 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/1614

4 9

git:master:28068310: htable: exported sht_rm_name() and sht_rm_value() to KEMI
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 2806831045cdb8f110737a87470382c28c5ce094 URL: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T10:08:12+02:00 htable: exported sht_rm_name() and sht_rm_value() to KEMI --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… Patch: https://github.com/kamailio/kamailio/commit/2806831045cdb8f110737a87470382c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 43c58d1942..834583fa0c 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -525,6 +525,17 @@ static int w_ht_rm_value(sip_msg_t* msg, char* hname, char* op, char *val) return w_ht_rm_items(msg, hname, op, val, 1); } +static int ki_ht_rm_name(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 0); + +} + +static int ki_ht_rm_value(sip_msg_t* msg, str* sname, str* sop, str *sval) +{ + return ht_rm_items(msg, sname, sop, sval, 1); +} + static int ht_reset_by_name(str *hname) { ht_t *ht; @@ -1321,6 +1332,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm_name"), + SR_KEMIP_INT, ki_ht_rm_name, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_rm_value"), + SR_KEMIP_INT, ki_ht_rm_value, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:d68c1bcb: pv: increased transformation buffer slots from 4 to 8
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: d68c1bcb350bce2f1951b604f97e246734e43b84 URL: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:48:02+02:00 pv: increased transformation buffer slots from 4 to 8 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… Patch: https://github.com/kamailio/kamailio/commit/d68c1bcb350bce2f1951b604f97e246… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 30c6379a7f..79e31a9ded 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -59,7 +59,7 @@ static param_t* _tr_uri_params = NULL; /*! transformation buffer size */ #define TR_BUFFER_SIZE 65536 -#define TR_BUFFER_SLOTS 4 +#define TR_BUFFER_SLOTS 8 /*! transformation buffer */ static char **_tr_buffer_list = NULL;

1 0

git:master:533e8f5c: pv: new transformation {s.unquote}
by Daniel-Constantin Mierla 04 Sep '18

04 Sep '18

Module: kamailio Branch: master Commit: 533e8f5cca940652f8507a272b076d51161432bd URL: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-04T09:46:01+02:00 pv: new transformation {s.unquote} - return the value without surrounding double/single quotes (" or ') --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… Patch: https://github.com/kamailio/kamailio/commit/533e8f5cca940652f8507a272b076d5… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index f93a5e3d6f..30c6379a7f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1156,6 +1156,30 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, val->ri = 0; break; + case TR_S_UNQUOTE: + if(!(val->flags&PV_VAL_STR)) { + val->rs.s = int2str(val->ri, &val->rs.len); + break; + } + if(val->rs.len<2) { + break; + } + if(val->rs.len>TR_BUFFER_SIZE-2) { + LM_ERR("value too large: %d\n", val->rs.len); + return -1; + } + if((val->rs.s[0] == val->rs.s[val->rs.len-1]) + && (val->rs.s[0] == '"' || val->rs.s[0] == '\'')) { + memcpy(_tr_buffer, val->rs.s+1, val->rs.len-2); + val->rs.len -= 2; + } else { + memcpy(_tr_buffer, val->rs.s, val->rs.len); + } + val->flags = PV_VAL_STR; + val->rs.s = _tr_buffer; + val->rs.s[val->rs.len] = '\0'; + break; + default: LM_ERR("unknown subtype %d (cfg line: %d)\n", subtype, get_cfg_crt_line()); @@ -2508,6 +2532,9 @@ char* tr_parse_string(str* in, trans_t *t) } else if(name.len==15 && strncasecmp(name.s, "urldecode.param", 15)==0) { t->subtype = TR_S_URLDECODEPARAM; goto done; + } else if(name.len==7 && strncasecmp(name.s, "unquote", 7)==0) { + t->subtype = TR_S_UNQUOTE; + goto done; } LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index a4bc0759e8..ca24a3c108 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -41,7 +41,7 @@ enum _tr_s_subtype { TR_S_STRIP, TR_S_STRIPTAIL, TR_S_PREFIXES, TR_S_PREFIXES_QUOT, TR_S_REPLACE, TR_S_TIMEFORMAT, TR_S_TRIM, TR_S_RTRIM, TR_S_LTRIM, TR_S_RM, TR_S_STRIPTO, TR_S_URLENCODEPARAM, TR_S_URLDECODEPARAM, TR_S_NUMERIC, TR_S_ESCAPECSV, - TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH + TR_S_ENCODEBASE58, TR_S_DECODEBASE58, TR_S_COREHASH, TR_S_UNQUOTE }; enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT,

1 0

[kamailio] support usrloc handle_lost_tcp variable also in DB-Only scheme (#171)
by juha-h 04 Sep '18

04 Sep '18

--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/171

2 3

[kamailio/kamailio] auth_db Deprecate email_address in database schemas (#858)
by Olle E. Johansson 03 Sep '18

03 Sep '18

I suggest we delete the "email_address" field in database schemas for auth_db. I think it was put there as an example of extendability but a lot of users seems confused about this and Kamailio by default does not use that field at all. Any opinions? If we reach an agreement we'll produce patches and clean up the various schemas. -- 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/858

3 8

git:master:5e0440aa: kamctl: regenerated db schema files
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 5e0440aa27154c263fc883f3a7cb9680805af6c3 URL: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:51:59+02:00 kamctl: regenerated db schema files --- Modified: utils/kamctl/db_berkeley/kamailio/subscriber Modified: utils/kamctl/db_redis/kamailio/location Modified: utils/kamctl/db_redis/kamailio/subscriber Modified: utils/kamctl/db_sqlite/auth_db-create.sql Modified: utils/kamctl/dbtext/kamailio/subscriber Modified: utils/kamctl/mongodb/kamailio/subscriber.json Modified: utils/kamctl/mysql/auth_db-create.sql Modified: utils/kamctl/oracle/auth_db-create.sql Modified: utils/kamctl/postgres/auth_db-create.sql Modified: utils/kamctl/xhttp_pi/auth_db-mod Modified: utils/kamctl/xhttp_pi/auth_db-table Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968… Patch: https://github.com/kamailio/kamailio/commit/5e0440aa27154c263fc883f3a7cb968…

1 0

git:master:01045cc2: lib/srdb1: schema - removed rpid and email_address columns from subscriber
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 01045cc2e2f2b86e109c661ca1748809cda68b7a URL: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T20:48:39+02:00 lib/srdb1: schema - removed rpid and email_address columns from subscriber - they are not used by auth_db module - version number not needed to be updated, no default queries being affected - GH #858 --- Modified: src/lib/srdb1/schema/subscriber.xml --- Diff: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… Patch: https://github.com/kamailio/kamailio/commit/01045cc2e2f2b86e109c661ca174880… --- diff --git a/src/lib/srdb1/schema/subscriber.xml b/src/lib/srdb1/schema/subscriber.xml index 39575719ed..8aaa03976e 100644 --- a/src/lib/srdb1/schema/subscriber.xml +++ b/src/lib/srdb1/schema/subscriber.xml @@ -75,24 +75,6 @@ <description>md5(username@domain:realm:password)</description> </column> - <column> - <name>email_address</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>Email address</description> - </column> - - <column> - <name>rpid</name> - <type>string</type> - <size>&uri_len;</size> - <null/> - <default><null/></default> - <description>The SIP Remote-Party-ID header identifies the calling party and includes user, party, screen and privacy headers that specify how a call is presented and screened.</description> - </column> - <index> <name>account_idx</name> <colref linkend="username"/>

1 0

[kamailio] add GnuTLS support (#371)
by zabbal 03 Sep '18

03 Sep '18

OpenSSL is well known for huge amount of deadly security vulnerabilities, even before heartbleed. It would be nice if I could avoid bringing in such a library just because of Kamailio - having support for GnuTLS will let the user to make such a choice. --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/371

4 6

[kamailio/kamailio] ims_isc module does not deliver to AS after asynchronous SAR to HSS (distinct PSI) (#1168)
by Christoph VALENTIN 03 Sep '18

03 Sep '18

### Description This is the same test case as I used for bug Report #1160 I used kamailio as an scscf (based on the configuration files from kamailio/examples/scscf) I did some changes according to my needs I did some Basic tests - the results were satisfying --> OK I configured a distinct PSI on the HSS (sip:04321234501@vict-ims.net) --> OK I registered some user from a Zoiper Client --> OK I told zoiper to call sip:04321234501@vict-ims.net --> I received 555 AS Contacting Failed - iFC terminated dialog ### Troubleshooting For some reason, the ims_isc module cannot deliver the Initial INVITE to the AS. First I thought, there was a bug in TM module, however there was no bug in TM module (please find the Explanation in issue #1160) The ims_isc module issues a CRITICAL log: File 2017_06_20_distinct_psi_03_scscf_kamailio.log: Line 642 - 660: Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_avp.c:138]: cxdx_get_avp(): cxdx_get_experimental_result_code: Failed finding avp Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_registrar_scscf [cxdx_sar.c:84]: create_return_code(): created AVP successfully : [saa_return_code] - [1] Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=127 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=143 a=21 n=switch Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=130 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[UNREG_SAR_REPLY] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=131 a=5 n=route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=673 a=26 n=xlog Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=675 a=24 n=t_newtran Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: tm [tm.c:1316]: w_t_newtran(): ERROR: t_newtran: transaction already in process 0x7ff2a6e66a58 Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=677 a=25 n=set_dlg_profile Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=685 a=25 n=is_method Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=686 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=687 a=63 n=assign Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=688 a=24 n=record_route Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=698 a=16 n=if Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: ERROR: *** cfgtrace:failure_route=[term] c=[/usr/local/etc/kamailio-scscf/kamailio-scscf-routes.cfg] l=692 a=26 n=isc_match_filter Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: INFO: ims_isc [mod.c:233]: isc_match_filter(): Checking triggers Jun 20 16:14:12 vict-ims /usr/local/sbin/kamailio[108125]: CRITICAL: ims_isc [mod.c:284]: isc_match_filter(): SKIP: 0 #### Reproduction I can help to reproduce the issue. mailto:christoph.valentin@kapsch.net Currently I have got an experimental test setup using Zoiper Clients. After week 27 I should have simulated test cases to repeat the Scenario "per mouse-click" #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` #### SIP Traffic  ``` sip || diameter traffic at the s-cscf (172.29.21.23) [logs-tshark-routes_2017_06_21.zip](https://github.com/kamailio/kamailio/fil… ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@vict-ims ~]# kamailio -v version: kamailio 4.4.5 (x86_64/linux) b0945e-dirty 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: b0945e -dirty compiled on 20:06:13 Jun 7 2017 with gcc 4.8.5 [root@vict-ims ~]# ``` * **Operating System**:  ``` [root@vict-ims ~]# uname -a Linux vict-ims 3.10.0-229.el7.x86_64 #1 SMP Thu Jan 29 18:37:38 EST 2015 x86_64 x86_64 x86_64 GNU/Linux [root@vict-ims ~]# ``` -- 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/1168

2 8

git:master:91211184: htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 9121118444e638223c789641618ed4145a67b0f3 URL: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T14:50:16+02:00 htable: exported sht_rm_value_re() and sht_rm_name_re() to kemi - GH #1614 --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… Patch: https://github.com/kamailio/kamailio/commit/9121118444e638223c789641618ed41… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index fbe016e0aa..43c58d1942 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -354,13 +354,49 @@ static int fixup_ht_key(void** param, int param_no) return 0; } -static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo) +/** + * + */ +static int ht_rm_re_helper(sip_msg_t *msg, ht_t *ht, str *rexp, int rmode) +{ + int_str isval; + + if (ht->dmqreplicate>0) { + isval.s = *rexp; + if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &ht->name, NULL, + AVP_VAL_STR, &isval, rmode)!=0) { + LM_ERR("dmq relication failed for [%.*s]\n", ht->name.len, ht->name.s); + } + } + if(ht_rm_cell_re(rexp, ht, rmode)<0) + return -1; + return 1; +} + +/** + * + */ +static int ki_ht_rm_name_re(sip_msg_t *msg, str *htname, str *rexp) +{ + ht_t *ht; + + ht = ht_get_table(htname); + if(ht==NULL) { + return 1; + } + + return ht_rm_re_helper(msg, ht, rexp, 0); +} + +/** + * + */ +static int ht_rm_name_re(sip_msg_t* msg, char* key, char* foo) { ht_pv_t *hpv; str sre; pv_spec_t *sp; sp = (pv_spec_t*)key; - int_str isval; hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; @@ -375,24 +411,33 @@ static int ht_rm_name_re(struct sip_msg* msg, char* key, char* foo) LM_ERR("cannot get $sht expression\n"); return -1; } - if (hpv->ht->dmqreplicate>0) { - isval.s = sre; - if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &hpv->htname, NULL, AVP_VAL_STR, &isval, 0)!=0) { - LM_ERR("dmq relication failed\n"); - } + return ht_rm_re_helper(msg, hpv->ht, &sre, 0); +} + +/** + * + */ +static int ki_ht_rm_value_re(sip_msg_t *msg, str *htname, str *rexp) +{ + ht_t *ht; + + ht = ht_get_table(htname); + if(ht==NULL) { + return 1; } - if(ht_rm_cell_re(&sre, hpv->ht, 0)<0) - return -1; - return 1; + + return ht_rm_re_helper(msg, ht, rexp, 1); } -static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) +/** + * + */ +static int ht_rm_value_re(sip_msg_t* msg, char* key, char* foo) { ht_pv_t *hpv; str sre; pv_spec_t *sp; sp = (pv_spec_t*)key; - int_str isval; hpv = (ht_pv_t*)sp->pvp.pvn.u.dname; @@ -407,16 +452,7 @@ static int ht_rm_value_re(struct sip_msg* msg, char* key, char* foo) LM_ERR("cannot get $sht expression\n"); return -1; } - - if (hpv->ht->dmqreplicate>0) { - isval.s = sre; - if (ht_dmq_replicate_action(HT_DMQ_RM_CELL_RE, &hpv->htname, NULL, AVP_VAL_STR, &isval, 1)!=0) { - LM_ERR("dmq relication failed\n"); - } - } - if(ht_rm_cell_re(&sre, hpv->ht, 1)<0) - return -1; - return 1; + return ht_rm_re_helper(msg, hpv->ht, &sre, 1); } static int ht_rm_items(sip_msg_t* msg, str* hname, str* op, str *val, @@ -1275,6 +1311,16 @@ static sr_kemi_t sr_kemi_htable_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("htable"), str_init("sht_rm_name_re"), + SR_KEMIP_INT, ki_ht_rm_name_re, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("htable"), str_init("sht_rm_value_re"), + SR_KEMIP_INT, ki_ht_rm_value_re, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:23a4632f: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 23a4632ffacedf5b80b1be4a47cab6fddec90502 URL: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-09-03T13:01:47+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f… Patch: https://github.com/kamailio/kamailio/commit/23a4632ffacedf5b80b1be4a47cab6f…

1 0

git:master:65a50a5b: rr: ignore_sips - new parameter to control use of sips schema
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 65a50a5b4a4e37d940f9a33ec6c0d8079249de59 URL: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T12:27:41+02:00 rr: ignore_sips - new parameter to control use of sips schema - if set to different than 0, then record-route headers will be added with sip schema even if r-uri comes with sips. Allow interoperability with some UAs messing up routing when sips is used - default is 0 - use sips schema if in r-uri (existing behaviour) --- Modified: src/modules/rr/record.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… Patch: https://github.com/kamailio/kamailio/commit/65a50a5b4a4e37d940f9a33ec6c0d80… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 0d042b2d36..402e6d5573 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -69,6 +69,7 @@ #define RR_PARAM_BUF_SIZE 512 /*!< buffer for RR parameter */ +extern int rr_ignore_sips; /*! * \brief RR param buffer @@ -378,11 +379,11 @@ int record_route(struct sip_msg* _m, str *params) str user = {NULL, 0}; str* tag; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - int sips; + int sips = 0; int ret = 0; - + user.len = 0; - + if (add_username) { /* check if there is a custom user set */ if (get_custom_user(_m, &user) < 0) { @@ -428,7 +429,9 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); @@ -453,7 +456,7 @@ int record_route(struct sip_msg* _m, str *params) goto error; } } - + l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -461,7 +464,7 @@ int record_route(struct sip_msg* _m, str *params) ret = -3; goto error; } - + if (build_rr(l, l2, &user, tag, params, INBOUND, sips) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); ret = -4; @@ -499,10 +502,12 @@ int record_route_preset(struct sip_msg* _m, str* _data) int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; char *rr_prefix; int rr_prefix_len; - int sips; + int sips = 0; int ret = 0; - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if(sips==0) { rr_prefix = RR_PREFIX_SIP; rr_prefix_len = RR_PREFIX_SIP_LEN; @@ -756,9 +761,9 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) struct lump* l; struct lump* l2; int use_ob = rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0; - int sips; + int sips = 0; int ret = 0; - + user.len = 0; user.s = 0; @@ -799,7 +804,9 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = 0; } - sips = rr_is_sips(_m); + if(rr_ignore_sips==0) { + sips = rr_is_sips(_m); + } if (enable_double_rr) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); @@ -825,7 +832,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) goto error; } } - + l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -833,7 +840,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) ret = -6; goto error; } - + if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND, sips) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); ret = -7; diff --git a/src/modules/rr/rr_mod.c b/src/modules/rr/rr_mod.c index 36b1c046a8..a3ef5e880a 100644 --- a/src/modules/rr/rr_mod.c +++ b/src/modules/rr/rr_mod.c @@ -61,6 +61,7 @@ int rr_force_send_socket = 0; /*!< control if socket is forced by rr */ int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ static str custom_user_spec = {NULL, 0}; pv_spec_t custom_user_avp; +int rr_ignore_sips = 0; /*!< ignore sips schema when building record-route */ ob_api_t rr_obb; @@ -131,6 +132,7 @@ static param_export_t params[] ={ {"enable_socket_mismatch_warning",INT_PARAM,&enable_socket_mismatch_warning}, {"custom_user_avp", PARAM_STR, &custom_user_spec}, {"force_send_socket", PARAM_INT, &rr_force_send_socket}, + {"ignore_sips", PARAM_INT, &rr_ignore_sips}, {0, 0, 0 } };

1 0

git:master:096461d9: rr: docs for ignore_sips parameter
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 096461d90c5fd301fdfb77a52e2906e3f591f643 URL: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T12:49:39+02:00 rr: docs for ignore_sips parameter --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… Patch: https://github.com/kamailio/kamailio/commit/096461d90c5fd301fdfb77a52e2906e… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index f5fe00e131..7dd1868e2a 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -290,6 +290,26 @@ record_route(); ... modparam("rr", "force_send_socket", 1) ... +</programlisting> + </example> + </section> + <section id="rr.p.ignore_sips"> + <title><varname>ignore_sips</varname> (int)</title> + + <para> + If set to 1, the Record-Route header are build with 'sip' schema + always, ignoring the presence of 'sips' schema in request URI. + </para> + + <para><emphasis>Default value is 0 (use 'sips' if present in R-URI).</emphasis></para> + + <example> + <title>Set <varname>ignore_sips</varname> parameter</title> + + <programlisting format="linespecific"> +... +modparam("rr", "ignore_sips", 1) +... </programlisting> </example> </section>

1 0

git:master:8cebf48e: core: parse via - set len for host/port_str only if there is a value
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 8cebf48eeee70d23c6cf827e24b2f5fabda669ab URL: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:54:39+02:00 core: parse via - set len for host/port_str only if there is a value --- Modified: src/core/parser/parse_via.c --- Diff: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… Patch: https://github.com/kamailio/kamailio/commit/8cebf48eeee70d23c6cf827e24b2f5f… --- diff --git a/src/core/parser/parse_via.c b/src/core/parser/parse_via.c index 8c3d54ea5e..318bb8e6c6 100644 --- a/src/core/parser/parse_via.c +++ b/src/core/parser/parse_via.c @@ -2073,7 +2073,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = L_PORT; break; case L_PORT: /*eat the spaces*/ @@ -2081,7 +2081,7 @@ char *parse_via( break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = L_PARAM; break; case L_PARAM: /* eat the space */ @@ -2131,13 +2131,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_LF; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_LF; break; @@ -2176,13 +2176,13 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; saved_state = L_PORT; state = F_CR; break; case P_PORT: /*end of port */ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; saved_state = L_PARAM; state = F_CR; break; @@ -2212,7 +2212,7 @@ char *parse_via( break; case P_HOST: /*mark end of host*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PORT; break; case L_PORT: @@ -2257,13 +2257,13 @@ char *parse_via( LM_ERR("bad ipv6 reference\n"); goto error; case P_HOST: - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_PARAM; param_start = tmp + 1; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; case L_PORT: case L_PARAM: state = F_PARAM; @@ -2313,12 +2313,12 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_VIA; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_VIA; break; case L_PORT: @@ -2363,13 +2363,13 @@ char *parse_via( goto error; case P_HOST: /*mark the end*/ - vb->host.len = tmp - vb->host.s; + if(vb->host.s) vb->host.len = tmp - vb->host.s; state = F_COMMENT; c_nest++; break; case P_PORT: /*mark the end*/ - vb->port_str.len = tmp - vb->port_str.s; + if(vb->port_str.s) vb->port_str.len = tmp - vb->port_str.s; state = F_COMMENT; c_nest++; break; @@ -2469,7 +2469,7 @@ char *parse_via( switch(state) { case P_IP6HOST: /*mark the end*/ - vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ + if(vb->host.s) vb->host.len = (tmp - vb->host.s) + 1; /* include "]" */ state = L_PORT; break; case F_CRLF:

1 0

git:master:f8723954: dispatcher: more debug messages when updating dst
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: f8723954bf67359c92e8cd09ac6915f64ad1ce71 URL: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:23:38+02:00 dispatcher: more debug messages when updating dst --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… Patch: https://github.com/kamailio/kamailio/commit/f8723954bf67359c92e8cd09ac6915f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 7d7105df29..cb87392eb8 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2250,6 +2250,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) sr_xavp_t *rxavp = NULL; sr_xavp_t *lxavp = NULL; + LM_DBG("updating dst\n"); if(upos == DS_USE_NEXT) { if(!(ds_flags & DS_FAILOVER_ON) || ds_xavp_dst.len <= 0) { LM_WARN("failover support disabled\n"); @@ -2264,6 +2265,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) } if(upos == DS_USE_NEXT) { + LM_DBG("updating dst with next record\n"); /* use next destination - delete the current one and search the next */ xavp_rm(rxavp, NULL); @@ -2282,7 +2284,7 @@ int ds_update_dst(struct sip_msg *msg, int upos, int mode) lxavp = xavp_get(&ds_xavp_dst_addr, rxavp); if(lxavp==NULL || lxavp->val.type!=SR_XTYPE_STR) { - LM_WARN("no xavp uri field in next destination record\n"); + LM_WARN("no xavp uri field in next destination record (%p)\n", lxavp); return -1; }

1 0

git:master:3fef2b3c: core: xavp - more debug details when printing xavp
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 3fef2b3c18f83add1af13c2b84303b507e27aeca URL: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-03T09:23:08+02:00 core: xavp - more debug details when printing xavp --- Modified: src/core/xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… Patch: https://github.com/kamailio/kamailio/commit/3fef2b3c18f83add1af13c2b84303b5… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e1cf394171..66797f910b 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -540,11 +540,11 @@ void xavp_print_list_content(sr_xavp_t **head, int level) start = *head; else start=*_xavp_list_crt; - LM_INFO("+++++ start XAVP list: %p (level=%d)\n", start, level); + LM_INFO("+++++ start XAVP list: %p (%p) (level=%d)\n", start, head, level); avp = start; while(avp) { - LM_INFO(" *** XAVP name: %s\n", avp->name.s); + LM_INFO(" *** (l:%d - %p) XAVP name: %s\n", level, avp, avp->name.s); LM_INFO(" XAVP id: %u\n", avp->id); LM_INFO(" XAVP value type: %d\n", avp->val.type); switch(avp->val.type) { @@ -552,20 +552,20 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <null>\n"); break; case SR_XTYPE_INT: - LM_INFO(" XAVP value: %d\n", avp->val.v.i); + LM_INFO(" XAVP value (int): %d\n", avp->val.v.i); break; case SR_XTYPE_STR: - LM_INFO(" XAVP value: %s\n", avp->val.v.s.s); + LM_INFO(" XAVP value (str): %s\n", avp->val.v.s.s); break; case SR_XTYPE_TIME: - LM_INFO(" XAVP value: %lu\n", + LM_INFO(" XAVP value (time): %lu\n", (long unsigned int)avp->val.v.t); break; case SR_XTYPE_LONG: - LM_INFO(" XAVP value: %ld\n", avp->val.v.l); + LM_INFO(" XAVP value (long): %ld\n", avp->val.v.l); break; case SR_XTYPE_LLONG: - LM_INFO(" XAVP value: %lld\n", avp->val.v.ll); + LM_INFO(" XAVP value (llong): %lld\n", avp->val.v.ll); break; case SR_XTYPE_XAVP: LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); @@ -578,6 +578,7 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; } + LM_INFO(" *** (l:%d - %p) end\n", level, avp); avp = avp->next; } LM_INFO("----- end XAVP list: %p (level=%d)\n", start, level);

1 0

git:master:8e581a3e: core: functions to apply changes and update internal sip msg buffer
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 8e581a3ebe71eedb41ac7a41538e6b1b2b391744 URL: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-02T12:33:17+02:00 core: functions to apply changes and update internal sip msg buffer --- Modified: src/core/msg_translator.c Modified: src/core/msg_translator.h --- Diff: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… Patch: https://github.com/kamailio/kamailio/commit/8e581a3ebe71eedb41ac7a41538e6b1… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index f82d72c3cb..6929b22e0f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -3176,3 +3176,106 @@ int build_sip_msg_from_buf(struct sip_msg *msg, char *buf, int len, return 0; } +/** + * + */ +int sip_msg_update_buffer(sip_msg_t *msg, str *obuf) +{ + sip_msg_t tmp; + + if(obuf==NULL || obuf->s==NULL || obuf->len<=0) { + LM_ERR("invalid buffer parameter\n"); + return -1; + } + + if(obuf->len >= BUF_SIZE) { + LM_ERR("new buffer is too large (%d)\n", obuf->len); + return -1; + } + /* temporary copy */ + memcpy(&tmp, msg, sizeof(sip_msg_t)); + + /* reset dst uri and path vector to avoid freeing - restored later */ + if(msg->dst_uri.s != NULL) { + msg->dst_uri.s = NULL; + msg->dst_uri.len = 0; + } + if(msg->path_vec.s != NULL) { + msg->path_vec.s = NULL; + msg->path_vec.len = 0; + } + + /* free old msg structure */ + free_sip_msg(msg); + memset(msg, 0, sizeof(sip_msg_t)); + + /* restore msg fields */ + msg->buf = tmp.buf; + msg->id = tmp.id; + msg->rcv = tmp.rcv; + msg->set_global_address = tmp.set_global_address; + msg->set_global_port = tmp.set_global_port; + msg->flags = tmp.flags; + msg->msg_flags = tmp.msg_flags; + msg->hash_index = tmp.hash_index; + msg->force_send_socket = tmp.force_send_socket; + msg->fwd_send_flags = tmp.fwd_send_flags; + msg->rpl_send_flags = tmp.rpl_send_flags; + msg->dst_uri = tmp.dst_uri; + msg->path_vec = tmp.path_vec; + + memcpy(msg->buf, obuf->s, obuf->len); + msg->len = obuf->len; + msg->buf[msg->len] = '\0'; + + /* reparse the message */ + LM_DBG("SIP message content updated - reparsing\n"); + if(parse_msg(msg->buf, msg->len, msg) != 0) { + LM_ERR("parsing new sip message failed [[%.*s]]\n", msg->len, msg->buf); + /* exit config execution - sip_msg_t structure is no longer + * valid/safe for config */ + return 0; + } + + return 1; +} + +/** + * + */ +int sip_msg_apply_changes(sip_msg_t *msg) +{ + int ret; + dest_info_t dst; + str obuf; + + if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { + LM_ERR("invalid usage - not in request route or a reply\n"); + return -1; + } + + init_dest_info(&dst); + dst.proto = PROTO_UDP; + if(msg->first_line.type == SIP_REPLY) { + obuf.s = generate_res_buf_from_sip_res( + msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); + } else { + if(msg->msg_flags & FL_RR_ADDED) { + LM_ERR("cannot apply msg changes after adding record-route" + " header - it breaks conditional 2nd header\n"); + return -1; + } + obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, + &dst, + BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); + } + if(obuf.s == NULL) { + LM_ERR("couldn't update msg buffer content\n"); + return -1; + } + ret = sip_msg_update_buffer(msg, &obuf); + /* free new buffer - copied in the static buffer from old sip_msg_t */ + pkg_free(obuf.s); + + return ret; +} diff --git a/src/core/msg_translator.h b/src/core/msg_translator.h index d95c89f5e4..b6360ce3ff 100644 --- a/src/core/msg_translator.h +++ b/src/core/msg_translator.h @@ -180,4 +180,15 @@ void process_lumps( struct sip_msg* msg, unsigned int* orig_offs, struct dest_info* send_info, int flag); + +/** + * set the internal buffer for sip msg with obuf and reparse + */ +int sip_msg_update_buffer(sip_msg_t *msg, str *obuf); + +/** + * apply changes to sip msg buffer and reparse + */ +int sip_msg_apply_changes(sip_msg_t *msg); + #endif

1 0

git:master:6fadac0f: textopsx: use functions from core to apply changes
by Daniel-Constantin Mierla 03 Sep '18

03 Sep '18

Module: kamailio Branch: master Commit: 6fadac0fc8107a80663da7f975f066738151456b URL: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-09-02T12:42:37+02:00 textopsx: use functions from core to apply changes --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… Patch: https://github.com/kamailio/kamailio/commit/6fadac0fc8107a80663da7f975f0667… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 24bdf0c84f..cf2fe52b84 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -145,8 +145,6 @@ static int mod_init(void) */ static int ki_msg_update_buffer(sip_msg_t *msg, str *obuf) { - sip_msg_t tmp; - if(obuf==NULL || obuf->s==NULL || obuf->len<=0) { LM_ERR("invalid buffer parameter\n"); return -1; @@ -156,52 +154,8 @@ static int ki_msg_update_buffer(sip_msg_t *msg, str *obuf) LM_ERR("new buffer is too large (%d)\n", obuf->len); return -1; } - /* temporary copy */ - memcpy(&tmp, msg, sizeof(sip_msg_t)); - - /* reset dst uri and path vector to avoid freeing - restored later */ - if(msg->dst_uri.s != NULL) { - msg->dst_uri.s = NULL; - msg->dst_uri.len = 0; - } - if(msg->path_vec.s != NULL) { - msg->path_vec.s = NULL; - msg->path_vec.len = 0; - } - - /* free old msg structure */ - free_sip_msg(msg); - memset(msg, 0, sizeof(sip_msg_t)); - - /* restore msg fields */ - msg->buf = tmp.buf; - msg->id = tmp.id; - msg->rcv = tmp.rcv; - msg->set_global_address = tmp.set_global_address; - msg->set_global_port = tmp.set_global_port; - msg->flags = tmp.flags; - msg->msg_flags = tmp.msg_flags; - msg->hash_index = tmp.hash_index; - msg->force_send_socket = tmp.force_send_socket; - msg->fwd_send_flags = tmp.fwd_send_flags; - msg->rpl_send_flags = tmp.rpl_send_flags; - msg->dst_uri = tmp.dst_uri; - msg->path_vec = tmp.path_vec; - - memcpy(msg->buf, obuf->s, obuf->len); - msg->len = obuf->len; - msg->buf[msg->len] = '\0'; - - /* reparse the message */ - LM_DBG("SIP message content updated - reparsing\n"); - if(parse_msg(msg->buf, msg->len, msg) != 0) { - LM_ERR("parsing new sip message failed [[%.*s]]\n", msg->len, msg->buf); - /* exit config execution - sip_msg_t structure is no longer - * valid/safe for config */ - return 0; - } - return 1; + return sip_msg_update_buffer(msg, obuf); } /** @@ -222,39 +176,12 @@ static int ki_msg_set_buffer(sip_msg_t *msg, str *obuf) */ static int ki_msg_apply_changes(sip_msg_t *msg) { - int ret; - dest_info_t dst; - str obuf; - if(msg->first_line.type != SIP_REPLY && get_route_type() != REQUEST_ROUTE) { LM_ERR("invalid usage - not in request route or a reply\n"); return -1; } - init_dest_info(&dst); - dst.proto = PROTO_UDP; - if(msg->first_line.type == SIP_REPLY) { - obuf.s = generate_res_buf_from_sip_res( - msg, (unsigned int *)&obuf.len, BUILD_NO_VIA1_UPDATE); - } else { - if(msg->msg_flags & FL_RR_ADDED) { - LM_ERR("cannot apply msg changes after adding record-route" - " header - it breaks conditional 2nd header\n"); - return -1; - } - obuf.s = build_req_buf_from_sip_req(msg, (unsigned int *)&obuf.len, - &dst, - BUILD_NO_PATH | BUILD_NO_LOCAL_VIA | BUILD_NO_VIA1_UPDATE); - } - if(obuf.s == NULL) { - LM_ERR("couldn't update msg buffer content\n"); - return -1; - } - ret = ki_msg_update_buffer(msg, &obuf); - /* free new buffer - copied in the static buffer from old sip_msg_t */ - pkg_free(obuf.s); - - return ret; + return sip_msg_apply_changes(msg); } /**

1 0

Re: [sr-dev] [kamailio/kamailio] dmq: add optional parameter to dmq_handle_message() (bce0890)
by Emmanuel Schmidbauer 02 Sep '18

02 Sep '18

@miconda any chance this can get tagged for next release? -- 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/commit/bce08905dc0bea2f9bce44460dcaee4…

1 0

[kamailio/kamailio] include_hf_value: Not expected behaviour (#1629)
by sergey-safarov 02 Sep '18

02 Sep '18

### Description I want modify `Accept` header using include_hf_value. Need to add additional values to current. I do this using. ``` include_hf_value("Accept", "application/sdp"); include_hf_value("Accept", "application/pidf+xml"); ``` Expected result in SIP message ``` Accept: application/sdp, application/pidf+xml ``` Realy i get ``` Accept: application/sdp Accept: application/pidf+xml ``` ### Troubleshooting #### Reproduction Need to add this to kamailio config ``` Accept: application/sdp Accept: application/pidf+xml ``` #### Debugging Data None #### Log Messages None #### SIP Traffic PCAP file is attached. ### Possible Solutions None ### Additional Information Used kamailio 5.1 branch commit 9f04def504051dc8da3989b1f96e4b6633d31a75 Docker container kamailio/kamailio-ci ``` / # kamailio -v version: kamailio 5.1.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, 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_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 10:41:20 Aug 23 2018 with gcc 6.4.0 ``` * **Operating System**: ``` / # cat /etc/os-release NAME="Alpine Linux" ID=alpine VERSION_ID=3.8.0 PRETTY_NAME="Alpine Linux v3.8" HOME_URL="http://alpinelinux.org" BUG_REPORT_URL="http://bugs.alpinelinux.org" / # uname -a Linux 088bedf3b82f 4.14.13-300.fc27.x86_64 #1 SMP Thu Jan 11 04:00:01 UTC 2018 x86_64 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/1629

2 4

git:master:37c27ef7: modules: readme files regenerated - dmq ... [skip ci]
by Kamailio Dev 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 37c27ef7b42e2db7ea5754d4fe96854debc54b66 URL: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-31T21:01:29+02:00 modules: readme files regenerated - dmq ... [skip ci] --- Modified: src/modules/dmq/README --- Diff: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… Patch: https://github.com/kamailio/kamailio/commit/37c27ef7b42e2db7ea5754d4fe96854… --- diff --git a/src/modules/dmq/README b/src/modules/dmq/README index 909443f69d..d4ddcb8645 100644 --- a/src/modules/dmq/README +++ b/src/modules/dmq/README @@ -46,7 +46,7 @@ Charles Chance 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) @@ -109,7 +109,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) @@ -269,17 +269,23 @@ modparam("dmq", "ping_interval", 90) 4. Functions - 4.1. dmq_handle_message() + 4.1. dmq_handle_message([continue]) 4.2. dmq_send_message(peer, node, body, content_type) 4.3. dmq_bcast_message(peer, body, content_type) 4.4. dmq_t_replicate([skip_loop_test]) 4.5. dmq_is_from_node() -4.1. dmq_handle_message() +4.1. dmq_handle_message([continue]) Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. + Meaning of parameters: + * continue - by default, dmq_handle_message() will end execution of + routing script. If this optional parameter is set to "1", + dmq_handle_message() will continue executing the routing script + after it's been called. + This function can be used from REQUEST_ROUTE. Example 1.8. dmq_handle_message usage

1 0

git:master:18c1eb2c: Merge pull request #1626 from kamailio/dmq_handle_message-return
by GitHub 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 18c1eb2c05c9eadea240677db27576caaef0950c URL: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-31T19:50:05+01:00 Merge pull request #1626 from kamailio/dmq_handle_message-return dmq: add optional "continue" parameter to dmq_handle_message() --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… Patch: https://github.com/kamailio/kamailio/commit/18c1eb2c05c9eadea240677db27576c… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index b374b8de31..d28686da9c 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -91,6 +91,8 @@ static void destroy(void); static cmd_export_t cmds[] = { {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, 0, 0, REQUEST_ROUTE}, + {"dmq_handle_message", (cmd_function)w_dmq_handle_message, 1, + fixup_int_1, 0, REQUEST_ROUTE}, {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, fixup_spve_all, 0, ANY_ROUTE}, {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, @@ -412,4 +414,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_dmq_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0903f6b40c..26555e24a3 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -219,12 +219,22 @@ modparam("dmq", "ping_interval", 90) <title>Functions</title> <section id="dmq.f.dmq_handle_message"> <title> - <function moreinfo="none">dmq_handle_message()</function> + <function moreinfo="none">dmq_handle_message([continue])</function> </title> <para> Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. </para> + <para>Meaning of parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>continue</emphasis> - by default, dmq_handle_message() will end + execution of routing script. If this optional parameter is set to "1", dmq_handle_message() + will continue executing the routing script after it's been called. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE. </para> diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 679f671fc6..2293cc3600 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg) +int ki_dmq_handle_message(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -60,7 +60,7 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("sending reply\n"); goto error; } - return 0; + return returnval; } LM_DBG("dmq_handle_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); @@ -68,12 +68,22 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("failed to add dmq job\n"); goto error; } - return 0; + return returnval; error: return -1; } +int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) +{ + int i = 0; + if(str1) { + if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; + } + if(i>1) i = 1; + return ki_dmq_handle_message(msg, i); +} + int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg); -} \ No newline at end of file + return ki_dmq_handle_message(msg, 0); +} diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 5131f87c02..9c9f835745 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -24,7 +24,8 @@ #ifndef _MESSAGE_H_ #define _MESSAGE_H_ +int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message(sip_msg_t *msg, int returnval); #endif

1 0

git:master:bce08905: dmq: add optional parameter to dmq_handle_message()
by Emmanuel Schmidbauer 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: bce08905dc0bea2f9bce44460dcaee4e786b9bd2 URL: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-08-31T14:17:26-04:00 dmq: add optional parameter to dmq_handle_message() --- Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/doc/dmq_admin.xml Modified: src/modules/dmq/message.c Modified: src/modules/dmq/message.h --- Diff: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… Patch: https://github.com/kamailio/kamailio/commit/bce08905dc0bea2f9bce44460dcaee4… --- diff --git a/src/modules/dmq/dmq.c b/src/modules/dmq/dmq.c index b374b8de31..d28686da9c 100644 --- a/src/modules/dmq/dmq.c +++ b/src/modules/dmq/dmq.c @@ -91,6 +91,8 @@ static void destroy(void); static cmd_export_t cmds[] = { {"dmq_handle_message", (cmd_function)dmq_handle_message, 0, 0, 0, REQUEST_ROUTE}, + {"dmq_handle_message", (cmd_function)w_dmq_handle_message, 1, + fixup_int_1, 0, REQUEST_ROUTE}, {"dmq_send_message", (cmd_function)cfg_dmq_send_message, 4, fixup_spve_all, 0, ANY_ROUTE}, {"dmq_bcast_message", (cmd_function)cfg_dmq_bcast_message, 3, @@ -412,4 +414,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_dmq_exports); return 0; -} \ No newline at end of file +} diff --git a/src/modules/dmq/doc/dmq_admin.xml b/src/modules/dmq/doc/dmq_admin.xml index 0903f6b40c..26555e24a3 100644 --- a/src/modules/dmq/doc/dmq_admin.xml +++ b/src/modules/dmq/doc/dmq_admin.xml @@ -219,12 +219,22 @@ modparam("dmq", "ping_interval", 90) <title>Functions</title> <section id="dmq.f.dmq_handle_message"> <title> - <function moreinfo="none">dmq_handle_message()</function> + <function moreinfo="none">dmq_handle_message([continue])</function> </title> <para> Handles a DMQ message by passing it to the appropriate local peer (module). The peer is identified by the user part of the To header. </para> + <para>Meaning of parameters:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>continue</emphasis> - by default, dmq_handle_message() will end + execution of routing script. If this optional parameter is set to "1", dmq_handle_message() + will continue executing the routing script after it's been called. + </para> + </listitem> + </itemizedlist> <para> This function can be used from REQUEST_ROUTE. </para> diff --git a/src/modules/dmq/message.c b/src/modules/dmq/message.c index 679f671fc6..2293cc3600 100644 --- a/src/modules/dmq/message.c +++ b/src/modules/dmq/message.c @@ -40,7 +40,7 @@ str dmq_404_rpl = str_init("User Not Found"); /** * @brief config function to handle dmq messages */ -int ki_dmq_handle_message(sip_msg_t *msg) +int ki_dmq_handle_message(sip_msg_t *msg, int returnval) { dmq_peer_t *peer; if((parse_sip_msg_uri(msg) < 0) || (!msg->parsed_uri.user.s)) { @@ -60,7 +60,7 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("sending reply\n"); goto error; } - return 0; + return returnval; } LM_DBG("dmq_handle_message peer found: %.*s\n", msg->parsed_uri.user.len, msg->parsed_uri.user.s); @@ -68,12 +68,22 @@ int ki_dmq_handle_message(sip_msg_t *msg) LM_ERR("failed to add dmq job\n"); goto error; } - return 0; + return returnval; error: return -1; } +int w_dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) +{ + int i = 0; + if(str1) { + if(get_int_fparam(&i, msg, (fparam_t*)str1)<0) return -1; + } + if(i>1) i = 1; + return ki_dmq_handle_message(msg, i); +} + int dmq_handle_message(struct sip_msg *msg, char *str1, char *str2) { - return ki_dmq_handle_message(msg); -} \ No newline at end of file + return ki_dmq_handle_message(msg, 0); +} diff --git a/src/modules/dmq/message.h b/src/modules/dmq/message.h index 5131f87c02..9c9f835745 100644 --- a/src/modules/dmq/message.h +++ b/src/modules/dmq/message.h @@ -24,7 +24,8 @@ #ifndef _MESSAGE_H_ #define _MESSAGE_H_ +int w_dmq_handle_message(struct sip_msg *, char *str1, char *str2); int dmq_handle_message(struct sip_msg *, char *str1, char *str2); -int ki_dmq_handle_message(sip_msg_t *msg); +int ki_dmq_handle_message(sip_msg_t *msg, int returnval); #endif

1 0

[kamailio/kamailio] dmq: add optional parameter to dmq_handle_message() (#1626)
by Emmanuel Schmidbauer 31 Aug '18

31 Aug '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1626 -- Commit Summary -- * dmq: add optional parameter to dmq_handle_message() -- File Changes -- M src/modules/dmq/dmq.c (4) M src/modules/dmq/doc/dmq_admin.xml (12) M src/modules/dmq/message.c (19) M src/modules/dmq/message.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1626.patch https://github.com/kamailio/kamailio/pull/1626.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/1626

2 4

uac module unused var in master
by Juha Heinanen 31 Aug '18

31 Aug '18

CC (gcc) [M uac.so] uac_reg.o uac_reg.c: In function 'rpc_uac_reg_active': uac_reg.c:2110:6: warning: unused variable 'none' [-Wunused-variable] str none = {"none", 4}; ^~~~

2 1

git:master:0d2dd5b0: uac: remove unused variable 'none' compiler warning, reported from Juha
by Henning Westerholt 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 0d2dd5b0a2c4c910e27ae7162d72f446ff92e365 URL: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-31T19:12:19+02:00 uac: remove unused variable 'none' compiler warning, reported from Juha --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… Patch: https://github.com/kamailio/kamailio/commit/0d2dd5b0a2c4c910e27ae7162d72f44… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index ba53c8ed12..625cd434be 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -2107,7 +2107,6 @@ static void rpc_uac_reg_active(rpc_t* rpc, void* ctx) } omode = *reg_active; *reg_active = (nmode)?1:0; - str none = {"none", 4}; /* add entry node */ if (rpc->add(ctx, "{", &th) < 0) {

1 0

[kamailio/kamailio] debian pkg missing dependency on docbook2x (#1624)
by juha-h 31 Aug '18

31 Aug '18

Kamailio master build on Debian Stretch fails due to missing dependency on docbook2x. See https://lists.kamailio.org//pipermail/sr-dev/2018-August/047549.html for more info. -- 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/1624

3 8

[kamailio/kamailio] Module RTPPROXY param Timeout_Socket not Working (#1597)
by Hamid R. Hashmi 31 Aug '18

31 Aug '18

Kamailio didn't start listening on IP mentioned in Module RTPPROXY parameter [Timeout_Socket](https://kamailio.org/docs/modules/5.1.x/modules/rtpproxy.ht…. Below is my configuration file. ``` loadmodule "rtpproxy.so" modparam("rtpproxy", "rtpproxy_sock", "udp:127.0.0.1:7722") modparam("rtpproxy", "rtpproxy_tout", 1) modparam("rtpproxy", "rtpproxy_retr", 2) modparam("rtpproxy", "timeout_socket", "tcp:127.0.0.1:7725") ``` when I type a commmand on linux ```$ netstat -nlp``` it only shows SIP listening ports. Kamailio should start listening on ```tcp:1270.0.01:7725``` -- 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/1597

2 4

git:master:35aef078: core: Makefiles - catch unavailbility of docbook2man tool
by Daniel-Constantin Mierla 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 35aef078dfbcb92de9591eea2841b3ba0f9682f6 URL: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T12:45:24+02:00 core: Makefiles - catch unavailbility of docbook2man tool - print an info message instead of ending up in execution error of Makefile rule trying to generate man pages from xml files - DOCBOOK var renamed to DOCBOOKMAN to be more suggestive for its purpose - related to GH #1624 --- Modified: src/Makefile.modules Modified: src/Makefile.shared Modified: src/Makefile.utils --- Diff: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… Patch: https://github.com/kamailio/kamailio/commit/35aef078dfbcb92de9591eea2841b3b… --- diff --git a/src/Makefile.modules b/src/Makefile.modules index bbcca26122..8649db2756 100644 --- a/src/Makefile.modules +++ b/src/Makefile.modules @@ -278,16 +278,17 @@ endif #man page build rules ifneq (,$(wildcard $(MOD_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(MOD_NAME).7: $(MOD_NAME).xml - $(DOCBOOK) -s ../../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../../doc/stylesheets/serdoc2man.xsl $< man: $(MOD_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(MOD_NAME).xml" +endif +else +man: endif diff --git a/src/Makefile.shared b/src/Makefile.shared index 82a29d2447..9d2d81fe65 100644 --- a/src/Makefile.shared +++ b/src/Makefile.shared @@ -43,8 +43,8 @@ sh_err_fail= try_err=$(1) ; if [ $$? != 0 ]; then echo ERROR: $(1) failed ; fi endif -DOCBOOK = $(shell which docbook2x-man 2>/dev/null) -ifeq ($(DOCBOOK),) - DOCBOOK = $(shell which db2x_docbook2man 2>/dev/null) +DOCBOOKMAN = $(shell which docbook2x-man 2>/dev/null) +ifeq ($(DOCBOOKMAN),) + DOCBOOKMAN = $(shell which db2x_docbook2man 2>/dev/null) endif diff --git a/src/Makefile.utils b/src/Makefile.utils index f7ce508e17..e8a8b8a1a6 100644 --- a/src/Makefile.utils +++ b/src/Makefile.utils @@ -117,16 +117,17 @@ endif #man page build rules ifneq (,$(wildcard $(UTIL_NAME).xml)) - +ifneq ($(DOCBOOKMAN),) $(UTIL_NAME).7: $(UTIL_NAME).xml - $(DOCBOOK) -s ../../doc/stylesheets/serdoc2man.xsl $< + $(DOCBOOKMAN) -s ../../doc/stylesheets/serdoc2man.xsl $< man: $(UTIL_NAME).7 - else - man: - + @echo "info - no docbook to man tool to convert $(UTIL_NAME).xml" +endif +else +man: endif $(man_prefix)/$(man_dir)/man8:

1 0

git:master:aede7c48: modules: readme files regenerated - sipjson ... [skip ci]
by Kamailio Dev 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: aede7c4835dd516cea75a5191d1ae6af3460c3c8 URL: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-31T11:31:46+02:00 modules: readme files regenerated - sipjson ... [skip ci] --- Modified: src/modules/sipjson/README --- Diff: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… Patch: https://github.com/kamailio/kamailio/commit/aede7c4835dd516cea75a5191d1ae6a… --- diff --git a/src/modules/sipjson/README b/src/modules/sipjson/README index add1b53f97..525ae98351 100644 --- a/src/modules/sipjson/README +++ b/src/modules/sipjson/README @@ -93,6 +93,8 @@ Chapter 1. Admin Guide 'opt' parameter cannot be empty, '0' can be given when only default attributes are wanted. + B - (uppercase B) SIP message body + + c - (lowercase c) CSeq attributes + + t - (lowercase t) To header attributes * ovar - name of the output pseduo-variable This function can be used from ANY_ROUTE. @@ -105,6 +107,11 @@ sj_serialize("0B", "$var(json)"); 4. Output Samples The content of the output variable is a JSON. Next are some samples. + Note that the content might change with future development and this + example become outdated, simply print the document when you start + testing your config and match the name of the attribute with the name + of pseudo-variables to understand what values can be there. Unlike + pseudo-variables, the $null values might converted to empty strings. Example 1.2. sj_serialize output ... @@ -129,6 +136,7 @@ ing "ua":"sipsak 0.9.7pre", "ci":"482215126(a)172.17.0.2", "rb":"" + ... } ... # the sip message sent to Kamailio:

1 0

git:master:e913fa83: Merge pull request #1628 from rromrrom/crash_on_empty_string
by GitHub 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: e913fa83f87b34e236817b8db60341fe5a193a3d URL: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-31T11:24:38+02:00 Merge pull request #1628 from rromrrom/crash_on_empty_string tm: crash on memcpy fix --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… Patch: https://github.com/kamailio/kamailio/commit/e913fa83f87b34e236817b8db60341f… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 2f5488a309..271932c90c 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -299,6 +299,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) for (i=t->fwded_totags; i; i=i->next) { if (i->tag.len==tag->len + && i->tag.s && memcmp(i->tag.s, tag->s, tag->len) ==0 ){ /* to tag already recorded */ LM_DBG("to-tag retransmission\n");

1 0

[kamailio/kamailio] tm: crash on memcpy fix (#1628)
by rromrrom 31 Aug '18

31 Aug '18

- in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ x ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1628 -- Commit Summary -- * tm: crash on memcpy fix -- File Changes -- M src/modules/tm/t_reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1628.patch https://github.com/kamailio/kamailio/pull/1628.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/1628

2 2

git:master:db3b9dbd: tm: crash on memcpy fix
by Roman Romanchenko 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: db3b9dbd48f7bb74abf08b0e97bcac15015df719 URL: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… Author: Roman Romanchenko <rromanchenko(a)sipwise.com> Committer: Roman Romanchenko <rromanchenko(a)sipwise.com> Date: 2018-08-31T12:02:43+03:00 tm: crash on memcpy fix - in some cases tag is not initialized and lead to crash. Memory pointer check before writing to added. --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… Patch: https://github.com/kamailio/kamailio/commit/db3b9dbd48f7bb74abf08b0e97bcac1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 474851aa7c..f53625e833 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -299,6 +299,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) for (i=t->fwded_totags; i; i=i->next) { if (i->tag.len==tag->len + && i->tag.s && memcmp(i->tag.s, tag->s, tag->len) ==0 ){ /* to tag already recorded */ LM_DBG("to-tag retransmission\n");

1 0

git:master:4b3a7d37: sipjson: added options to serialize To and CSeq attributes
by Daniel-Constantin Mierla 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 4b3a7d37ce9d91bcd0367712de5ca1f2668eaebe URL: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T11:14:27+02:00 sipjson: added options to serialize To and CSeq attributes - c and t mode options --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… Patch: https://github.com/kamailio/kamailio/commit/4b3a7d37ce9d91bcd0367712de5ca1f… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index ca6ea8e8bd..e2798332f0 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -345,6 +345,26 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) srjson_AddStrStrToObject(jdoc, jr, "rb", 2, s.s, s.len); } break; + case 'c': + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) + || (msg->cseq==NULL)) ) { + s.s = ""; + s.len = 0; + } else { + s = get_cseq(msg)->number; + } + srjson_AddStrStrToObject(jdoc, jr, "cs", 2, s.s, s.len); + break; + case 't': + puri = parse_to_uri(msg); + if(puri==NULL) { + srjson_AddStrStrToObject(jdoc, jr, "tU", 2, "", 0); + srjson_AddStrStrToObject(jdoc, jr, "td", 2, "", 0); + } else { + sj_add_xuri_attr(puri, 1, "tU", 2, jdoc, jr); + sj_add_xuri_attr(puri, 2, "td", 2, jdoc, jr); + } + break; } } return 1;

1 0

git:master:6c5fc213: sipjson: docs - updates to serialize options and sample json section
by Daniel-Constantin Mierla 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 6c5fc21329bac531b64c1350c10e3d0490aefef6 URL: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T11:20:08+02:00 sipjson: docs - updates to serialize options and sample json section --- Modified: src/modules/sipjson/doc/sipjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… Patch: https://github.com/kamailio/kamailio/commit/6c5fc21329bac531b64c1350c10e3d0… --- diff --git a/src/modules/sipjson/doc/sipjson_admin.xml b/src/modules/sipjson/doc/sipjson_admin.xml index ccfa868073..f357367086 100644 --- a/src/modules/sipjson/doc/sipjson_admin.xml +++ b/src/modules/sipjson/doc/sipjson_admin.xml @@ -93,6 +93,16 @@ B - (uppercase B) SIP message body </para> </listitem> + <listitem> + <para> + c - (lowercase c) CSeq attributes + </para> + </listitem> + <listitem> + <para> + t - (lowercase t) To header attributes + </para> + </listitem> </itemizedlist> </listitem> <listitem> @@ -120,7 +130,12 @@ sj_serialize("0B", "$var(json)"); <section> <title>Output Samples</title> <para> - The content of the output variable is a JSON. Next are some samples. + The content of the output variable is a JSON. Next are some samples. Note + that the content might change with future development and this example + become outdated, simply print the document when you start testing your + config and match the name of the attribute with the name of pseudo-variables + to understand what values can be there. Unlike pseudo-variables, the + $null values might converted to empty strings. </para> <example> <title><function>sj_serialize</function> output</title> @@ -146,6 +161,7 @@ sj_serialize("0B", "$var(json)"); "ua":"sipsak 0.9.7pre", "ci":"482215126(a)172.17.0.2", "rb":"" + ... } ... # the sip message sent to &kamailio;:

1 0

git:master:957b43dd: tls: docs - some updates to sample tls.cfg
by Daniel-Constantin Mierla 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: 957b43ddea8dad434736e800a16581d49ccb2478 URL: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-31T10:19:06+02:00 tls: docs - some updates to sample tls.cfg --- Modified: src/modules/tls/tls.cfg --- Diff: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… Patch: https://github.com/kamailio/kamailio/commit/957b43ddea8dad434736e800a16581d… --- diff --git a/src/modules/tls/tls.cfg b/src/modules/tls/tls.cfg index c1a08f6759..dd25abd4ac 100644 --- a/src/modules/tls/tls.cfg +++ b/src/modules/tls/tls.cfg @@ -33,13 +33,13 @@ require_certificate = yes # This is an example server domain for TLS connections # received from the loopback interface. We allow -# the use of SSLv2 and SSLv3 protocols here, we do +# the use of TLSv1 protocols here, we do # not require that clients present client certificates # but if they present it it must be valid. We also use # a special certificate and CA list for loopback # interface. # -#[server:127.0.0.1:5061] +#[server:5.6.7.8:5061] #method = TLSv1 #verify_certificate = yes #require_certificate = no @@ -48,9 +48,11 @@ require_certificate = yes #verify_depth = 3 #ca_list = local_ca.pem #crl = local_crl.pem +#server_name = kamailio.org +#server_id = kamailio.org -# Special settings for the example.sip (1.2.3.4) public SIP -# server. We do not verify the certificate of the +# Special settings for connecting to the example.sip (1.2.3.4) +# public SIP server. We do not verify the certificate of the # server because it can be expired. The server # implements authentication using SSL client # certificates so configure the client certificate @@ -62,3 +64,5 @@ require_certificate = yes #private_key = /usr/local/etc/kamailio/tls/example_key.pem #ca_list = /usr/local/etc/kamailio/tls/example_ca.pem #crl = /usr/local/etc/kamailio/tls/example_crl.pem +#server_name = example.sip +#server_id = example.sip

1 0

git:master:bae838eb: misc/examples/ims/pcscf: Add ifdef guards for ipsec_*() calls
by Tsvetomir Dimitrov 31 Aug '18

31 Aug '18

Module: kamailio Branch: master Commit: bae838eb61f9852f6ef70b2c3f0dcaf71d880105 URL: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-08-31T09:58:24+03:00 misc/examples/ims/pcscf: Add ifdef guards for ipsec_*() calls --- Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/route/register.cfg --- Diff: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… Patch: https://github.com/kamailio/kamailio/commit/bae838eb61f9852f6ef70b2c3f0dcaf… --- diff --git a/misc/examples/ims/pcscf/route/mo.cfg b/misc/examples/ims/pcscf/route/mo.cfg index 235b9f1275..e192249571 100644 --- a/misc/examples/ims/pcscf/route/mo.cfg +++ b/misc/examples/ims/pcscf/route/mo.cfg @@ -95,7 +95,9 @@ onreply_route[MO_reply] { remove_hf("C-Params"); append_hf("Contact: $ct;$hdr(C-Params)\r\n"); } +#!ifdef WITH_IPSEC ipsec_forward("location"); +#!endif # In case of 1xx and 2xx do NAT if(status=~"[12][0-9][0-9]") route(NATMANAGE); diff --git a/misc/examples/ims/pcscf/route/register.cfg b/misc/examples/ims/pcscf/route/register.cfg index b2d1f92638..c10979d84a 100644 --- a/misc/examples/ims/pcscf/route/register.cfg +++ b/misc/examples/ims/pcscf/route/register.cfg @@ -156,13 +156,15 @@ onreply_route[REGISTER_reply] xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); update_stat("register_success", "+1"); update_stat("register_time", "$var(stat_add)"); - ipsec_forward("location"); +#!ifdef WITH_IPSEC + ipsec_forward("location"); } else { if (t_check_status("401")) { ipsec_create("location"); - } - } + } +#!endif + } exit; }

1 0

git:master:7f848ef9: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 7f848ef96f8dbe27b71d4436ffaf2291e488aac7 URL: https://github.com/kamailio/kamailio/commit/7f848ef96f8dbe27b71d4436ffaf229… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-30T12:31:37+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/7f848ef96f8dbe27b71d4436ffaf229… Patch: https://github.com/kamailio/kamailio/commit/7f848ef96f8dbe27b71d4436ffaf229… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 6a47fbccf2..e7cc136dd2 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -43,12 +43,12 @@ Ramona-Elena Modroiu 3.10. auth_username_avp (string) 3.11. auth_password_avp (string) 3.12. reg_db_url (string) - 3.13. reg_timer_interval (string) + 3.13. reg_timer_interval (int) 3.14. reg_retry_interval (int) 3.15. reg_random_delay (int) 3.16. reg_db_table (string) 3.17. reg_contact_addr (string) - 3.18. reg_keep_callid (string) + 3.18. reg_keep_callid (int) 3.19. reg_active (int) 4. Functions @@ -155,12 +155,12 @@ Chapter 1. Admin Guide 3.10. auth_username_avp (string) 3.11. auth_password_avp (string) 3.12. reg_db_url (string) - 3.13. reg_timer_interval (string) + 3.13. reg_timer_interval (int) 3.14. reg_retry_interval (int) 3.15. reg_random_delay (int) 3.16. reg_db_table (string) 3.17. reg_contact_addr (string) - 3.18. reg_keep_callid (string) + 3.18. reg_keep_callid (int) 3.19. reg_active (int) 4. Functions @@ -259,12 +259,12 @@ Chapter 1. Admin Guide 3.10. auth_username_avp (string) 3.11. auth_password_avp (string) 3.12. reg_db_url (string) - 3.13. reg_timer_interval (string) + 3.13. reg_timer_interval (int) 3.14. reg_retry_interval (int) 3.15. reg_random_delay (int) 3.16. reg_db_table (string) 3.17. reg_contact_addr (string) - 3.18. reg_keep_callid (string) + 3.18. reg_keep_callid (int) 3.19. reg_active (int) 3.1. rr_from_store_param (string) @@ -443,7 +443,7 @@ modparam("uac", "reg_db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") ... -3.13. reg_timer_interval (string) +3.13. reg_timer_interval (int) Timer interval (in seconds) at which registrations are managed, e.g. renewed as needed. @@ -504,7 +504,7 @@ modparam("uac", "reg_db_table", "uacreg") modparam("uac", "reg_contact_addr", "192.168.1.2:5080") ... -3.18. reg_keep_callid (string) +3.18. reg_keep_callid (int) If set to 0 (default), a new Call-Id will be generated for each registration attempt. If set to non-zero, the same Call-Id will be used

1 0

git:master:84f30a22: uac: docs - fixed types of some params and removed trailing white spaces
by Daniel-Constantin Mierla 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 84f30a2207084457d7053535e1ae84bd8ea855ec URL: https://github.com/kamailio/kamailio/commit/84f30a2207084457d7053535e1ae84b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-30T12:20:44+02:00 uac: docs - fixed types of some params and removed trailing white spaces --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/84f30a2207084457d7053535e1ae84b… Patch: https://github.com/kamailio/kamailio/commit/84f30a2207084457d7053535e1ae84b…

1 0

git:master:056b98d6: sipjson: serialize reply status code and reason phrase in default attributes
by Daniel-Constantin Mierla 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 056b98d6717af79eb4f40a5d02cd343bdac8c628 URL: https://github.com/kamailio/kamailio/commit/056b98d6717af79eb4f40a5d02cd343… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-30T12:18:11+02:00 sipjson: serialize reply status code and reason phrase in default attributes --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/056b98d6717af79eb4f40a5d02cd343… Patch: https://github.com/kamailio/kamailio/commit/056b98d6717af79eb4f40a5d02cd343… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 1dc82eb777..ca6ea8e8bd 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -285,6 +285,9 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) srjson_AddStrStrToObject(jdoc, jr, "rU", 2, "", 0); srjson_AddStrStrToObject(jdoc, jr, "rd", 2, "", 0); srjson_AddNumberToObject(jdoc, jr, "rp", 0); + srjson_AddNumberToObject(jdoc, jr, "rs", msg->first_line.u.reply.statuscode); + srjson_AddStrStrToObject(jdoc, jr, "rr", 2, + msg->first_line.u.reply.reason.s, msg->first_line.u.reply.reason.len); } else { if(msg->parsed_uri_ok==0 && parse_sip_msg_uri(msg)<0) { srjson_AddStrStrToObject(jdoc, jr, "rU", 2, "", 0); @@ -296,6 +299,8 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) sj_add_xuri_attr(puri, 2, "rd", 2, jdoc, jr); sj_add_xuri_attr(puri, 3, "rp", 2, jdoc, jr); } + srjson_AddNumberToObject(jdoc, jr, "rs", 0); + srjson_AddStrStrToObject(jdoc, jr, "rr", 2, "", 0); } puri = parse_from_uri(msg);

1 0

git:master:4f8a2bec: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 4f8a2becb5d9aa53eeaca1f6bdba7e55bdfe4ebb URL: https://github.com/kamailio/kamailio/commit/4f8a2becb5d9aa53eeaca1f6bdba7e5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-30T10:31:29+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/4f8a2becb5d9aa53eeaca1f6bdba7e5… Patch: https://github.com/kamailio/kamailio/commit/4f8a2becb5d9aa53eeaca1f6bdba7e5…

1 0

git:master:49f35427: uac: reg_active - new parameter to control if remote registrations are active
by Daniel-Constantin Mierla 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 49f354276df3cfc2cdb0f85b5a1839f86733aead URL: https://github.com/kamailio/kamailio/commit/49f354276df3cfc2cdb0f85b5a1839f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-30T10:16:14+02:00 uac: reg_active - new parameter to control if remote registrations are active - default 1 (active) - can be changed at runtime via rpc command uac.reg_active 0|1 --- Modified: src/modules/uac/uac.c Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/49f354276df3cfc2cdb0f85b5a1839f… Patch: https://github.com/kamailio/kamailio/commit/49f354276df3cfc2cdb0f85b5a1839f…

1 0

git:master:505d42ad: uac: docs for reg_active param and uac.reg_active rpc command
by Daniel-Constantin Mierla 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 505d42ad214848420335542132b44ab7180a7b65 URL: https://github.com/kamailio/kamailio/commit/505d42ad214848420335542132b44ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-30T10:23:19+02:00 uac: docs for reg_active param and uac.reg_active rpc command --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/505d42ad214848420335542132b44ab… Patch: https://github.com/kamailio/kamailio/commit/505d42ad214848420335542132b44ab… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 650ec8823c..637d976e25 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -507,6 +507,27 @@ modparam("uac", "reg_keep_callid", 1) </example> </section> + + <section id="uac.p.reg_active"> + <title><varname>reg_active</varname> (int)</title> + <para> + If set to 0, no remote regisrations are done. In other words, + it can control at once if the module should do remote registratios + or not. It can be changed at runtime via rpc command + 'uac.reg_active 0|1'. + </para> + <para>The default value is 1 (active).</para> + <example> + <title>Set <varname>reg_active</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("uac", "reg_active", 0) +... + </programlisting> + </example> + </section> + + </section> <section> @@ -1165,6 +1186,26 @@ event_route[uac:reply] { </example> </section> + <section id="uac.r.uac.reg_active"> + <title> + <function moreinfo="none">uac.reg_active</function> + </title> + <para> + Control if the module should do remote registrations or not. Setting + to 1 enables remote registrations for all records and 0 disables + doing them. + </para> + <example> + <title><function>uac.reg_active</function> usage</title> + <programlisting format="linespecific"> +... + kamctl rpc uac.reg_active 0 + kamctl rpc uac.reg_active 1 +... + </programlisting> + </example> + </section> + </section> <section>

1 0

git:master:094d36ae: modules: readme files regenerated - sipjson ... [skip ci]
by Kamailio Dev 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 094d36ae1f28dd22310c59ee0fab85e382c43c2e URL: https://github.com/kamailio/kamailio/commit/094d36ae1f28dd22310c59ee0fab85e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-30T08:16:53+02:00 modules: readme files regenerated - sipjson ... [skip ci] --- Modified: src/modules/sipjson/README --- Diff: https://github.com/kamailio/kamailio/commit/094d36ae1f28dd22310c59ee0fab85e… Patch: https://github.com/kamailio/kamailio/commit/094d36ae1f28dd22310c59ee0fab85e… --- diff --git a/src/modules/sipjson/README b/src/modules/sipjson/README index f8578b2f61..add1b53f97 100644 --- a/src/modules/sipjson/README +++ b/src/modules/sipjson/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2018 asipto.com + Copyright Â© 2018 asipto.com __________________________________________________________________ Table of Contents @@ -27,9 +27,12 @@ Daniel-Constantin Mierla 3.1. sj_serialize(opt, ovar) + 4. Output Samples + List of Examples 1.1. sj_serialize usage + 1.2. sj_serialize output Chapter 1. Admin Guide @@ -45,12 +48,15 @@ Chapter 1. Admin Guide 3.1. sj_serialize(opt, ovar) + 4. Output Samples + 1. Overview This module serializes SIP message attributes into a JSON document. It can facilitate getting the SIP attributes in a structure inside one - of the embedded interpreters (e.g., KEMI interpreters). + of the embedded interpreters (e.g., KEMI interpreters, Lua can parse + JSON in an internal hash table). 2. Dependencies @@ -72,7 +78,7 @@ Chapter 1. Admin Guide 3.1. sj_serialize(opt, ovar) -3.1. sj_serialize(opt, ovar) +3.1. sj_serialize(opt, ovar) Do the serialization of SIP messagge attributes into a JSON document. @@ -95,3 +101,48 @@ Chapter 1. Admin Guide ... sj_serialize("0B", "$var(json)"); ... + +4. Output Samples + + The content of the output variable is a JSON. Next are some samples. + + Example 1.2. sj_serialize output +... +# the content of $var(json) after sj_serialize("0B", "$var(json)") +# - the content is compacted, next it has been pretty-formatted for better view +ing +... +{ + "mt":2, + "rm":"OPTIONS", + "pr":"udp", + "si":"127.0.0.1", + "sp":36747, + "Ri":"127.0.0.1", + "Rp":5060, + "ru":"sip:alice@127.0.0.1", + "rU":"alice", + "rd":"127.0.0.1", + "rp":0, + "fU":"sipsak", + "fd":"172.17.0.2", + "ua":"sipsak 0.9.7pre", + "ci":"482215126(a)172.17.0.2", + "rb":"" +} +... +# the sip message sent to Kamailio: +... +OPTIONS sip:alice@127.0.0.1 SIP/2.0 +Via: SIP/2.0/UDP 127.0.0.1:65502;branch=z9hG4bK.79e78613;rport;alias +From: sip:sipsak@172.17.0.2;tag=74806173 +To: sip:alice@127.0.0.1 +Call-ID: 482215126(a)172.17.0.2 +CSeq: 1 OPTIONS +Contact: sip:sipsak@127.0.0.1:65502 +Content-Length: 0 +Max-Forwards: 70 +User-Agent: sipsak 0.9.7pre +Accept: text/plain + +...

1 0

git:master:2a636f59: sipjson: docs - added sample of output content
by Daniel-Constantin Mierla 30 Aug '18

30 Aug '18

Module: kamailio Branch: master Commit: 2a636f593597fae4082923a9aee78b9963eccbc1 URL: https://github.com/kamailio/kamailio/commit/2a636f593597fae4082923a9aee78b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-30T08:06:12+02:00 sipjson: docs - added sample of output content --- Modified: src/modules/sipjson/doc/sipjson_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2a636f593597fae4082923a9aee78b9… Patch: https://github.com/kamailio/kamailio/commit/2a636f593597fae4082923a9aee78b9… --- diff --git a/src/modules/sipjson/doc/sipjson_admin.xml b/src/modules/sipjson/doc/sipjson_admin.xml index 5624678033..ccfa868073 100644 --- a/src/modules/sipjson/doc/sipjson_admin.xml +++ b/src/modules/sipjson/doc/sipjson_admin.xml @@ -20,7 +20,8 @@ </para> <para> It can facilitate getting the SIP attributes in a structure inside one - of the embedded interpreters (e.g., KEMI interpreters). + of the embedded interpreters (e.g., KEMI interpreters, Lua can parse + JSON in an internal hash table). </para> </section> @@ -116,5 +117,54 @@ sj_serialize("0B", "$var(json)"); </section> + <section> + <title>Output Samples</title> + <para> + The content of the output variable is a JSON. Next are some samples. + </para> + <example> + <title><function>sj_serialize</function> output</title> + <programlisting format="linespecific"> +... +# the content of $var(json) after sj_serialize("0B", "$var(json)") +# - the content is compacted, next it has been pretty-formatted for better viewing +... +{ + "mt":2, + "rm":"OPTIONS", + "pr":"udp", + "si":"127.0.0.1", + "sp":36747, + "Ri":"127.0.0.1", + "Rp":5060, + "ru":"sip:alice@127.0.0.1", + "rU":"alice", + "rd":"127.0.0.1", + "rp":0, + "fU":"sipsak", + "fd":"172.17.0.2", + "ua":"sipsak 0.9.7pre", + "ci":"482215126(a)172.17.0.2", + "rb":"" +} +... +# the sip message sent to &kamailio;: +... +OPTIONS sip:alice@127.0.0.1 SIP/2.0 +Via: SIP/2.0/UDP 127.0.0.1:65502;branch=z9hG4bK.79e78613;rport;alias +From: sip:sipsak@172.17.0.2;tag=74806173 +To: sip:alice@127.0.0.1 +Call-ID: 482215126(a)172.17.0.2 +CSeq: 1 OPTIONS +Contact: sip:sipsak@127.0.0.1:65502 +Content-Length: 0 +Max-Forwards: 70 +User-Agent: sipsak 0.9.7pre +Accept: text/plain + +... +</programlisting> + </example> + </section> </chapter>

1 0

Info: Cluecon Weekly about Kamailio, today at 17:00GMT
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Hello, if you haven't seen the news article on kamailio.org, today at 17:00GMT I will be part of the Cluecon Weekly online video conference to present about what's new lately in Kamailio, plans for the future as well as address questions about using Kamailio together with FreeSwitch. Anyone can join via audio or video calls, more details about at: * https://www.kamailio.org/w/2018/08/kamailio-on-cluecon-weekly-aug-29-2018/ * https://freeswitch.org/confluence/display/FREESWITCH/ClueCon+Weekly+Confere… Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com Kamailio Advanced Training, Nov 12-14, 2018, in Berlin -- www.asipto.com

1 1

git:master:97de3d8a: sipjson: link root object to json structure
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Module: kamailio Branch: master Commit: 97de3d8aef8cf1e8475b42d3b81cf20d31f99f4d URL: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-29T12:08:18+02:00 sipjson: link root object to json structure --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20… Patch: https://github.com/kamailio/kamailio/commit/97de3d8aef8cf1e8475b42d3b81cf20… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index f1dad02dfc..1dc82eb777 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -80,24 +80,19 @@ static int ki_sj_serialize_helper(sip_msg_t* msg, str* smode, pv_spec_t *pvs) return -1; } + LM_DBG("sip to json serialization...\n"); srjson_InitDoc(&jdoc, NULL); if(sj_serialize_data(msg, &jdoc, smode)<0) { + LM_ERR("json serialization failure\n"); goto error; } - if(jdoc.buf.s != NULL) { - jdoc.free_fn(jdoc.buf.s); - jdoc.buf.s = NULL; - jdoc.buf.len = 0; - } jdoc.buf.s = srjson_PrintUnformatted(&jdoc, jdoc.root); - if(jdoc.buf.s!=NULL){ - jdoc.buf.len = strlen(jdoc.buf.s); - } memset(&val, 0, sizeof(pv_value_t)); if(jdoc.buf.s!=NULL) { + jdoc.buf.len = strlen(jdoc.buf.s); val.flags = PV_VAL_STR; val.rs = jdoc.buf; @@ -115,6 +110,7 @@ static int ki_sj_serialize_helper(sip_msg_t* msg, str* smode, pv_spec_t *pvs) } } srjson_DestroyDoc(&jdoc); + LM_DBG("sip to json serialization done...\n"); return 1; @@ -225,6 +221,7 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) LM_ERR("cannot create json root obj\n"); goto error; } + jdoc->root = jr; if(parse_headers(msg, HDR_EOH_F, 0) < 0) { LM_ERR("failed to parse headers\n"); @@ -345,10 +342,10 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) break; } } - return 1; error: + LM_ERR("failed to build the json serialization document\n"); return -1; }

1 0

git:master:1d33a04b: sipjson: added module version define
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Module: kamailio Branch: master Commit: 1d33a04b551394f50b4e27ff48a366c563b72dce URL: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-29T11:47:04+02:00 sipjson: added module version define --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… Patch: https://github.com/kamailio/kamailio/commit/1d33a04b551394f50b4e27ff48a366c… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 1c210223a6..f1dad02dfc 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -33,6 +33,10 @@ #include "../../lib/srutils/srjson.h" + +MODULE_VERSION + + static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode); static int w_sj_serialize(sip_msg_t* msg, char* mode, char* vout);

1 0

git:master:d1ccbc11: sipjson: exported sj_serialize(...) to kemi framework
by Daniel-Constantin Mierla 29 Aug '18

29 Aug '18

Module: kamailio Branch: master Commit: d1ccbc11aeaab5fbd2c169458e95d09a48fbeed7 URL: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-29T11:21:56+02:00 sipjson: exported sj_serialize(...) to kemi framework --- Modified: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… Patch: https://github.com/kamailio/kamailio/commit/d1ccbc11aeaab5fbd2c169458e95d09… --- diff --git a/src/modules/sipjson/sipjson_mod.c b/src/modules/sipjson/sipjson_mod.c index 7c0069e105..1c210223a6 100644 --- a/src/modules/sipjson/sipjson_mod.c +++ b/src/modules/sipjson/sipjson_mod.c @@ -346,4 +346,27 @@ static int sj_serialize_data(sip_msg_t* msg, srjson_doc_t *jdoc, str* smode) error: return -1; +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_sipjson_exports[] = { + { str_init("sipjson"), str_init("sj_serialize"), + SR_KEMIP_INT, ki_sj_serialize, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_sipjson_exports); + return 0; } \ No newline at end of file

1 0

git:master:779115c9: Makefile.groups: added sipjson module to group extra
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: 779115c943ccecfe767836f7324d704b1bc633c5 URL: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T17:31:22+02:00 Makefile.groups: added sipjson module to group extra --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… Patch: https://github.com/kamailio/kamailio/commit/779115c943ccecfe767836f7324d704… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 0c5386365f..04a5ae730f 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -18,10 +18,11 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ auth_xkeys smsops tsilo cfgt statsc topos sipdump # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute \ - pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ - xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ - log_custom keepalive ss7ops app_sqlang acc_diameter evrexec +mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ + carrierroute pdb qos sca seas sms sst timer tmrec uac_redirect \ + xhttp xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ + log_custom keepalive ss7ops app_sqlang acc_diameter evrexec \ + sipjson # - common modules depending on database mod_list_db=acc alias_db auth_db avpops cfg_db db_text db_flatstore \

1 0

git:master:120aad0f: sipjson: new module to serialize sip message attributes into a json doc
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: 120aad0fb98b437b5e7cfd06fabb8f02c6dc90cc URL: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T17:28:42+02:00 sipjson: new module to serialize sip message attributes into a json doc --- Added: src/modules/sipjson/Makefile Added: src/modules/sipjson/README Added: src/modules/sipjson/doc/Makefile Added: src/modules/sipjson/doc/sipjson.xml Added: src/modules/sipjson/doc/sipjson_admin.xml Added: src/modules/sipjson/sipjson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0… Patch: https://github.com/kamailio/kamailio/commit/120aad0fb98b437b5e7cfd06fabb8f0…

1 0

git:master:d014e2c7: app_python3: implemented KSR.pv.getvs(...) an KSR.pv.getvn(...)
by Daniel-Constantin Mierla 28 Aug '18

28 Aug '18

Module: kamailio Branch: master Commit: d014e2c726001268133a4b1bddaff77495a7be1d URL: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-28T09:56:28+02:00 app_python3: implemented KSR.pv.getvs(...) an KSR.pv.getvn(...) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… Patch: https://github.com/kamailio/kamailio/commit/d014e2c726001268133a4b1bddaff77… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 69666e2d5e..9f78e53089 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -828,6 +828,106 @@ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } +/** + * + */ +static PyObject *sr_apy_kemi_pv_push_valx(int rmode, int xival, str *xsval) +{ + if(rmode==1) { + return sr_kemi_apy_return_int(NULL, xival); + } else { + return sr_apy_kemi_return_str(NULL, xsval->s, xsval->len); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_valx(PyObject *self, PyObject *args, + int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + int pl; + sr_apy_env_t *env_P; + sip_msg_t *lmsg = NULL; + int xival = 0; + str xsval = str_init(""); + + env_P = sr_apy_env_get(); + + if(env_P==NULL) { + LM_ERR("invalid Python environment attributes\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + if(env_P->msg==NULL) { + lmsg = faked_msg_next(); + } else { + lmsg = env_P->msg; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(rmode==1) { + if(!PyArg_ParseTuple(args, "si:pv.getvn", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } else { + if(!PyArg_ParseTuple(args, "ss:pv.getvs", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } + + if(pvn.s==NULL || lmsg==NULL) { + LM_ERR("invalid context attributes\n"); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + pvn.len = strlen(pvn.s); + + LM_DBG("pv set: %s\n", pvn.s); + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(lmsg, pvs, &val) != 0) { + LM_ERR("unable to get pv value for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + return sr_kemi_apy_return_int(NULL, val.ri); + } + return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvs(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvn(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 1); +} + /** * */ @@ -1063,6 +1163,10 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value or <<null>>"}, {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"getvs", sr_apy_kemi_f_pv_getvs, METH_VARARGS, + NAME " - pv get value of pv or str val param"}, + {"getvn", sr_apy_kemi_f_pv_getvn, METH_VARARGS, + NAME " - pv get value of pv or int val param"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

1 0

[kamailio/kamailio] smsops: Add support for concatenated SMS in decode_3gpp_sms() (#1617)
by Tsvetomir Dimitrov 27 Aug '18

27 Aug '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 #XXXX (replace XXXX with an open issue number) #### Description  Support for concatenated SMS messages in smsops module. The current implementation doesn't handle correctly concatenated SMSes. The patch adds support for them in the smsops module, including dumping a concatenated message to the log and new PVs with SMS message parameters. There are also small fixes in the indentation - spaces are replaces with tabs, as this seeems to be the preferred approach in the file. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1617 -- Commit Summary -- * smsops: Add support for concatenated SMS in decode_3gpp_sms() -- File Changes -- M src/modules/smsops/smsops_impl.c (472) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1617.patch https://github.com/kamailio/kamailio/pull/1617.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/1617

3 4

git:master:453190fb: app_python: implemented KSR.pv.getvs(...) and KSR.pv.getvn(...)
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: 453190fb28c5e4f3190d54c59a4845cbf3e7cd75 URL: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:39:16+02:00 app_python: implemented KSR.pv.getvs(...) and KSR.pv.getvn(...) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… Patch: https://github.com/kamailio/kamailio/commit/453190fb28c5e4f3190d54c59a4845c… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 13764664df..1de3b3b3fe 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -805,6 +805,106 @@ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } +/** + * + */ +static PyObject *sr_apy_kemi_pv_push_valx(int rmode, int xival, str *xsval) +{ + if(rmode==1) { + return sr_kemi_apy_return_int(NULL, xival); + } else { + return sr_apy_kemi_return_str(NULL, xsval->s, xsval->len); + } +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_get_valx(PyObject *self, PyObject *args, + int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + int pl; + sr_apy_env_t *env_P; + sip_msg_t *lmsg = NULL; + int xival = 0; + str xsval = str_init(""); + + env_P = sr_apy_env_get(); + + if(env_P==NULL) { + LM_ERR("invalid Python environment attributes\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + if(env_P->msg==NULL) { + lmsg = faked_msg_next(); + } else { + lmsg = env_P->msg; + } + + memset(&val, 0, sizeof(pv_value_t)); + if(rmode==1) { + if(!PyArg_ParseTuple(args, "si:pv.getvn", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } else { + if(!PyArg_ParseTuple(args, "ss:pv.getvs", &pvn.s, &xival)) { + LM_ERR("unable to retrieve str-int params\n"); + return sr_apy_kemi_return_none_mode(rmode); + } + } + + if(pvn.s==NULL || lmsg==NULL) { + LM_ERR("invalid context attributes\n"); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + val.flags |= PV_TYPE_INT|PV_VAL_INT; + pvn.len = strlen(pvn.s); + + LM_DBG("pv set: %s\n", pvn.s); + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(lmsg, pvs, &val) != 0) { + LM_ERR("unable to get pv value for [%s]\n", pvn.s); + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return sr_apy_kemi_pv_push_valx(rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + return sr_kemi_apy_return_int(NULL, val.ri); + } + return sr_apy_kemi_return_str(NULL, val.rs.s, val.rs.len); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvs(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 0); +} + +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_getvn(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_valx(self, args, 1); +} + /** * */ @@ -1038,6 +1138,10 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value"}, {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"getvs", sr_apy_kemi_f_pv_getvs, METH_VARARGS, + NAME " - pv get value of pv or str val param"}, + {"getvn", sr_apy_kemi_f_pv_getvn, METH_VARARGS, + NAME " - pv get value of pv or int val param"}, {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, NAME " - pv get value or empty string"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS,

1 0

git:master:b7047205: app_lua: rmode 1 corresponds to int returned value
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: b7047205287a0fde12b3568bd0cd0425eeb68fcd URL: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:38:35+02:00 app_lua: rmode 1 corresponds to int returned value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… Patch: https://github.com/kamailio/kamailio/commit/b7047205287a0fde12b3568bd0cd042… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 165f43bf06..24ae3fb63e 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -906,9 +906,9 @@ static int lua_sr_pv_push_val_null (lua_State *L, int rmode) static int lua_sr_pv_push_valx (lua_State *L, int rmode, int vi, str *vs) { if(rmode==1) { - lua_pushlstring(L, vs->s, vs->len); - } else { lua_pushinteger(L, vi); + } else { + lua_pushlstring(L, vs->s, vs->len); } return 1; }

1 0

git:master:c1701cf3: app_python: give scan format to PyArg_ParseTuple() via param
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: c1701cf3e57adbf8448c414bfb8ba10426a69104 URL: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:18:47+02:00 app_python: give scan format to PyArg_ParseTuple() via param --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… Patch: https://github.com/kamailio/kamailio/commit/c1701cf3e57adbf8448c414bfb8ba10… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index b40c042777..13764664df 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -723,7 +723,7 @@ PyObject *sr_apy_kemi_return_none_mode(int rmode) * */ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, - int rmode) + char *pfmt, int rmode) { str pvn; pv_spec_t *pvs; @@ -744,7 +744,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, lmsg = env_P->msg; } - if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { + if(!PyArg_ParseTuple(args, pfmt, &pvn.s)) { LM_ERR("unable to retrieve str param\n"); return sr_apy_kemi_return_none_mode(rmode); } @@ -786,7 +786,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, */ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 0); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.get", 0); } /** @@ -794,7 +794,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 1); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.getw", 1); } /** @@ -802,7 +802,7 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 2); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } /**

1 0

git:master:22749d33: app_python3: give scan format to PyArg_ParseTuple() via param
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: 22749d33e7d93422a69233a6fb0e60f2f2267c88 URL: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T12:16:58+02:00 app_python3: give scan format to PyArg_ParseTuple() via param --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… Patch: https://github.com/kamailio/kamailio/commit/22749d33e7d93422a69233a6fb0e60f… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index cc7dfa6ccf..69666e2d5e 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -746,7 +746,7 @@ PyObject *sr_apy_kemi_return_none_mode(int rmode) * */ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, - int rmode) + char *pfmt, int rmode) { str pvn; pv_spec_t *pvs; @@ -767,7 +767,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, lmsg = env_P->msg; } - if(!PyArg_ParseTuple(args, "s:pv.get", &pvn.s)) { + if(!PyArg_ParseTuple(args, pfmt, &pvn.s)) { LM_ERR("unable to retrieve str param\n"); return sr_apy_kemi_return_none_mode(rmode); } @@ -809,7 +809,7 @@ static PyObject *sr_apy_kemi_f_pv_get_mode(PyObject *self, PyObject *args, */ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 0); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.get", 0); } /** @@ -817,7 +817,7 @@ static PyObject *sr_apy_kemi_f_pv_get(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 1); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.getw", 1); } /** @@ -825,7 +825,7 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) */ static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) { - return sr_apy_kemi_f_pv_get_mode(self, args, 2); + return sr_apy_kemi_f_pv_get_mode(self, args, "s:pv.gete", 2); } /**

1 0

git:master:89c65fa3: app_sqlang: implemented KSR.pv.gete(...)
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: 89c65fa3210ab0682d4cb699d732ac1653ba0221 URL: https://github.com/kamailio/kamailio/commit/89c65fa3210ab0682d4cb699d732ac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T10:47:34+02:00 app_sqlang: implemented KSR.pv.gete(...) --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/89c65fa3210ab0682d4cb699d732ac1… Patch: https://github.com/kamailio/kamailio/commit/89c65fa3210ab0682d4cb699d732ac1… --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index 0d4672c32b..1d4f60abd6 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -277,9 +277,12 @@ static int sqlang_gettype(HSQUIRRELVM J, int idx) */ static SQInteger sqlang_sr_get_str_null(HSQUIRRELVM J, int rmode) { - if(rmode) { + if(rmode==1) { sqlang_pushlstring(J, "<<null>>", 8); return 1; + } else if(rmode==2) { + sqlang_pushlstring(J, "", 0); + return 1; } else { return 0; } @@ -347,6 +350,14 @@ static SQInteger sqlang_sr_pv_getw(HSQUIRRELVM J) return sqlang_sr_pv_get_mode(J, 1); } +/** + * + */ +static SQInteger sqlang_sr_pv_gete(HSQUIRRELVM J) +{ + return sqlang_sr_pv_get_mode(J, 2); +} + /** * */ @@ -538,6 +549,7 @@ static SQInteger sqlang_sr_pv_is_null (HSQUIRRELVM J) const SQRegFunction _sr_kemi_pv_J_Map[] = { { "get", sqlang_sr_pv_get, 2 /* 1 args */, NULL }, { "getw", sqlang_sr_pv_getw, 2 /* 1 args */, NULL }, + { "gete", sqlang_sr_pv_gete, 2 /* 1 args */, NULL }, { "seti", sqlang_sr_pv_seti, 3 /* 2 args */, NULL }, { "sets", sqlang_sr_pv_sets, 4 /* 2 args */, NULL }, { "unset", sqlang_sr_pv_unset, 2 /* 1 args */, NULL },

1 0

git:master:de5561dd: app_ruby: implemented KSR.pv.gete(...)
by Daniel-Constantin Mierla 27 Aug '18

27 Aug '18

Module: kamailio Branch: master Commit: de5561ddbf821348b76b6e2ed044f10a0cec017a URL: https://github.com/kamailio/kamailio/commit/de5561ddbf821348b76b6e2ed044f10… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-27T10:43:39+02:00 app_ruby: implemented KSR.pv.gete(...) --- Modified: src/modules/app_ruby/app_ruby_api.c --- Diff: https://github.com/kamailio/kamailio/commit/de5561ddbf821348b76b6e2ed044f10… Patch: https://github.com/kamailio/kamailio/commit/de5561ddbf821348b76b6e2ed044f10… --- diff --git a/src/modules/app_ruby/app_ruby_api.c b/src/modules/app_ruby/app_ruby_api.c index 965c5e3c84..06d8cf2ce7 100644 --- a/src/modules/app_ruby/app_ruby_api.c +++ b/src/modules/app_ruby/app_ruby_api.c @@ -245,10 +245,12 @@ int sr_kemi_ruby_return_int(sr_kemi_t *ket, int rc) */ static VALUE sr_kemi_ruby_return_none(int rmode) { - if(rmode==0) { - return Qnil; + if(rmode==1) { + return rb_str_new_cstr("<<null>>"); + } else if(rmode==2) { + return rb_str_new_cstr(""); } - return rb_str_new_cstr("<<null>>"); + return Qnil; } /** @@ -320,6 +322,14 @@ static VALUE app_ruby_pv_getw(int argc, VALUE* argv, VALUE self) return app_ruby_pv_get_mode(argc, argv, self, 1); } +/** + * + */ +static VALUE app_ruby_pv_gete(int argc, VALUE* argv, VALUE self) +{ + return app_ruby_pv_get_mode(argc, argv, self, 2); +} + /** * */ @@ -549,6 +559,7 @@ static VALUE app_ruby_pv_is_null(int argc, VALUE* argv, VALUE self) static ksr_ruby_export_t _sr_kemi_pv_R_Map[] = { {"PV", "get", app_ruby_pv_get}, {"PV", "getw", app_ruby_pv_getw}, + {"PV", "gete", app_ruby_pv_gete}, {"PV", "seti", app_ruby_pv_seti}, {"PV", "sets", app_ruby_pv_sets}, {"PV", "unset", app_ruby_pv_unset},

1 0

git:master:7bd55ca7: ipops: exported KSR.ipops.is_in_subnet(...)
by Daniel-Constantin Mierla 26 Aug '18

26 Aug '18

Module: kamailio Branch: master Commit: 7bd55ca760a2b1aed8da431b61370c750742ff84 URL: https://github.com/kamailio/kamailio/commit/7bd55ca760a2b1aed8da431b61370c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-26T10:37:38+02:00 ipops: exported KSR.ipops.is_in_subnet(...) - match the function name from kamailio.cfg - so far it was exported as KSR.ipops.ip_is_in_subnet(...) --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/7bd55ca760a2b1aed8da431b61370c7… Patch: https://github.com/kamailio/kamailio/commit/7bd55ca760a2b1aed8da431b61370c7… --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 262f4a8494..ac55df7906 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -1418,6 +1418,11 @@ static sr_kemi_t sr_kemi_ipops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("ipops"), str_init("is_in_subnet"), + SR_KEMIP_INT, ki_ip_is_in_subnet, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("ipops"), str_init("is_ip_rfc1918"), SR_KEMIP_INT, ki_is_ip_rfc1918, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:d92216eb: app_jsdt: implemented kemi KSR.pv.gete(...)
by Daniel-Constantin Mierla 26 Aug '18

26 Aug '18

Module: kamailio Branch: master Commit: d92216ebdb94c4a068437c083c9f1809ddfa8857 URL: https://github.com/kamailio/kamailio/commit/d92216ebdb94c4a068437c083c9f180… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-26T09:53:03+02:00 app_jsdt: implemented kemi KSR.pv.gete(...) --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/d92216ebdb94c4a068437c083c9f180… Patch: https://github.com/kamailio/kamailio/commit/d92216ebdb94c4a068437c083c9f180… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 224d54bfe6..9b6dda8472 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -158,14 +158,16 @@ int sr_kemi_jsdt_return_int(duk_context *J, sr_kemi_t *ket, int rc) /** * */ -static int jsdt_sr_return_none(duk_context *J, int rmode) +static int jsdt_sr_return_pv_null(duk_context *J, int rmode) { - if(rmode) { + if(rmode==1) { duk_push_lstring(J, "<<null>>", 8); - return 1; + } else if(rmode==2) { + duk_push_lstring(J, "", 0); } else { - return 0; + duk_push_string(J, NULL); } + return 1; } /** @@ -183,32 +185,27 @@ static int jsdt_sr_pv_get_mode(duk_context *J, int rmode) pvn.s = (char*)duk_to_string(J, 0); if(pvn.s==NULL || env_J->msg==NULL) - return jsdt_sr_return_none(J, rmode); + return jsdt_sr_return_pv_null(J, rmode); pvn.len = strlen(pvn.s); LM_DBG("pv get: %s\n", pvn.s); pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - return jsdt_sr_return_none(J, rmode); + return jsdt_sr_return_pv_null(J, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - return jsdt_sr_return_none(J, rmode); + return jsdt_sr_return_pv_null(J, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_J->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - return jsdt_sr_return_none(J, rmode); + return jsdt_sr_return_pv_null(J, rmode); } if(val.flags&PV_VAL_NULL) { - if(rmode) { - jsdt_sr_return_none(J, rmode); - } else { - duk_push_string(J, NULL); - return 1; - } + return jsdt_sr_return_pv_null(J, rmode); } if(val.flags&PV_TYPE_INT) { duk_push_int(J, val.ri); @@ -234,6 +231,14 @@ static int jsdt_sr_pv_getw(duk_context *J) return jsdt_sr_pv_get_mode(J, 1); } +/** + * + */ +static int jsdt_sr_pv_gete(duk_context *J) +{ + return jsdt_sr_pv_get_mode(J, 2); +} + /** * */ @@ -425,6 +430,7 @@ static int jsdt_sr_pv_is_null (duk_context *J) const duk_function_list_entry _sr_kemi_pv_J_Map[] = { { "get", jsdt_sr_pv_get, 1 /* 1 args */ }, { "getw", jsdt_sr_pv_getw, 1 /* 1 args */ }, + { "gete", jsdt_sr_pv_gete, 1 /* 1 args */ }, { "seti", jsdt_sr_pv_seti, 2 /* 2 args */ }, { "sets", jsdt_sr_pv_sets, 2 /* 2 args */ }, { "unset", jsdt_sr_pv_unset, 1 /* 1 args */ },

1 0

git:master:63498d6c: app_python: implemented KSR.pv.gete(...)
by Daniel-Constantin Mierla 25 Aug '18

25 Aug '18

Module: kamailio Branch: master Commit: 63498d6c2180645562f495077d6b414b12b39820 URL: https://github.com/kamailio/kamailio/commit/63498d6c2180645562f495077d6b414… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-25T16:13:25+02:00 app_python: implemented KSR.pv.gete(...) --- Modified: src/modules/app_python/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/63498d6c2180645562f495077d6b414… Patch: https://github.com/kamailio/kamailio/commit/63498d6c2180645562f495077d6b414… --- diff --git a/src/modules/app_python/apy_kemi.c b/src/modules/app_python/apy_kemi.c index 7110912b92..b40c042777 100644 --- a/src/modules/app_python/apy_kemi.c +++ b/src/modules/app_python/apy_kemi.c @@ -710,8 +710,10 @@ static sr_kemi_t _sr_apy_kemi_test[] = { */ PyObject *sr_apy_kemi_return_none_mode(int rmode) { - if(rmode) { + if(rmode==1) { return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else if(rmode==2) { + return sr_apy_kemi_return_str(NULL, "", 0); } else { return sr_apy_kemi_return_none(); } @@ -795,6 +797,14 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, 1); } +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 2); +} + /** * */ @@ -1028,6 +1038,8 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value"}, {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, + NAME " - pv get value or empty string"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

1 0

git:master:a837f69a: app_python3: implemented KSR.pv.gete(...)
by Daniel-Constantin Mierla 25 Aug '18

25 Aug '18

Module: kamailio Branch: master Commit: a837f69aacc93c55f89a91bcbb0f1cfbe539ab7c URL: https://github.com/kamailio/kamailio/commit/a837f69aacc93c55f89a91bcbb0f1cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-25T16:15:46+02:00 app_python3: implemented KSR.pv.gete(...) --- Modified: src/modules/app_python3/apy_kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/a837f69aacc93c55f89a91bcbb0f1cf… Patch: https://github.com/kamailio/kamailio/commit/a837f69aacc93c55f89a91bcbb0f1cf… --- diff --git a/src/modules/app_python3/apy_kemi.c b/src/modules/app_python3/apy_kemi.c index 1e9fd23d48..cc7dfa6ccf 100755 --- a/src/modules/app_python3/apy_kemi.c +++ b/src/modules/app_python3/apy_kemi.c @@ -733,8 +733,10 @@ static sr_kemi_t _sr_apy_kemi_test[] = { */ PyObject *sr_apy_kemi_return_none_mode(int rmode) { - if(rmode) { + if(rmode==1) { return sr_apy_kemi_return_str(NULL, "<<null>>", 8); + } else if(rmode==2) { + return sr_apy_kemi_return_str(NULL, "", 0); } else { return sr_apy_kemi_return_none(); } @@ -818,6 +820,14 @@ static PyObject *sr_apy_kemi_f_pv_getw(PyObject *self, PyObject *args) return sr_apy_kemi_f_pv_get_mode(self, args, 1); } +/** + * + */ +static PyObject *sr_apy_kemi_f_pv_gete(PyObject *self, PyObject *args) +{ + return sr_apy_kemi_f_pv_get_mode(self, args, 2); +} + /** * */ @@ -1051,6 +1061,8 @@ static PyMethodDef _sr_apy_kemi_pv_Methods[] = { NAME " - pv get value"}, {"getw", sr_apy_kemi_f_pv_getw, METH_VARARGS, NAME " - pv get value or <<null>>"}, + {"gete", sr_apy_kemi_f_pv_gete, METH_VARARGS, + NAME " - pv get value or <<null>>"}, {"seti", sr_apy_kemi_f_pv_seti, METH_VARARGS, NAME " - pv set int value"}, {"sets", sr_apy_kemi_f_pv_sets, METH_VARARGS,

1 0

git:master:fd3656fb: app_lua: proper return 'nil' for $null values of pvs
by Daniel-Constantin Mierla 25 Aug '18

25 Aug '18

Module: kamailio Branch: master Commit: fd3656fba3fe5dcb472836f935e2b4781b02251e URL: https://github.com/kamailio/kamailio/commit/fd3656fba3fe5dcb472836f935e2b47… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-25T16:01:39+02:00 app_lua: proper return 'nil' for $null values of pvs --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/fd3656fba3fe5dcb472836f935e2b47… Patch: https://github.com/kamailio/kamailio/commit/fd3656fba3fe5dcb472836f935e2b47… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 61c661852d..165f43bf06 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -892,13 +892,12 @@ static int lua_sr_pv_push_val_null (lua_State *L, int rmode) { if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); - return 1; } else if(rmode==2) { lua_pushlstring(L, "", 0); - return 1; } else { - return 0; + lua_pushnil(L); } + return 1; } /**

1 0

git:master:1576dc7c: app_lua: new KEMI pv functions KSR.pv.getvn(...) and KSR.pv.getvs(...)
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: 1576dc7cf504a3a30e83919222f1b8441e4207b5 URL: https://github.com/kamailio/kamailio/commit/1576dc7cf504a3a30e83919222f1b84… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T11:43:53+02:00 app_lua: new KEMI pv functions KSR.pv.getvn(...) and KSR.pv.getvs(...) - KSR.pv.getvn(pv, ival) - return the value of pv if not null, otherwise return the int value ival - KSR.pv.getvs(pv, sval) - return the value of pv if not null, otherwise return the str value sval --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/1576dc7cf504a3a30e83919222f1b84… Patch: https://github.com/kamailio/kamailio/commit/1576dc7cf504a3a30e83919222f1b84… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index a57f94fcc7..61c661852d 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -901,6 +901,19 @@ static int lua_sr_pv_push_val_null (lua_State *L, int rmode) } } +/** + * + */ +static int lua_sr_pv_push_valx (lua_State *L, int rmode, int vi, str *vs) +{ + if(rmode==1) { + lua_pushlstring(L, vs->s, vs->len); + } else { + lua_pushinteger(L, vi); + } + return 1; +} + /** * */ @@ -971,6 +984,89 @@ static int lua_sr_pv_gete (lua_State *L) return lua_sr_pv_get_val(L, 2); } +/** + * + */ +static int lua_sr_pv_get_valx (lua_State *L, int rmode) +{ + str pvn; + pv_spec_t *pvs; + pv_value_t val; + sr_lua_env_t *env_L; + int pl; + int xival = 0; + str xsval = str_init(""); + + env_L = sr_lua_env_get(); + + if(lua_gettop(L)<2) { + LM_ERR("to few parameters [%d]\n", lua_gettop(L)); + return lua_sr_pv_push_val_null(L, 0); + } + if(rmode==1) { + if(!lua_isnumber(L, -1)) { + LM_ERR("invalid int parameter\n"); + return lua_sr_pv_push_val_null(L, 0); + } + xival = lua_tointeger(L, -1); + } else { + if(!lua_isstring(L, -1)) { + LM_ERR("invalid str parameter\n"); + return lua_sr_pv_push_val_null(L, 0); + } + xsval.s = (char*)lua_tostring(L, -1); + xsval.len = strlen(xsval.s); + } + + pvn.s = (char*)lua_tostring(L, -2); + if(pvn.s==NULL || env_L->msg==NULL) + return lua_sr_pv_push_valx(L, rmode, xival, &xsval); + + pvn.len = strlen(pvn.s); + LM_DBG("pv set: %s\n", pvn.s); + pl = pv_locate_name(&pvn); + if(pl != pvn.len) { + LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); + return lua_sr_pv_push_valx(L, rmode, xival, &xsval); + } + pvs = pv_cache_get(&pvn); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%s]\n", pvn.s); + return lua_sr_pv_push_valx(L, rmode, xival, &xsval); + } + + memset(&val, 0, sizeof(pv_value_t)); + if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { + LM_ERR("unable to get pv value for [%s]\n", pvn.s); + return lua_sr_pv_push_valx(L, rmode, xival, &xsval); + } + if(val.flags&PV_VAL_NULL) { + return lua_sr_pv_push_valx(L, rmode, xival, &xsval); + } + if(val.flags&PV_TYPE_INT) { + lua_pushinteger(L, val.ri); + return 1; + } + lua_pushlstring(L, val.rs.s, val.rs.len); + return 1; +} + +/** + * + */ +static int lua_sr_pv_getvs (lua_State *L) +{ + return lua_sr_pv_get_valx(L, 0); +} + +/** + * + */ +static int lua_sr_pv_getvn (lua_State *L) +{ + return lua_sr_pv_get_valx(L, 1); +} + /** * */ @@ -1179,6 +1275,8 @@ static const luaL_Reg _sr_pv_Map [] = { {"get", lua_sr_pv_get}, {"getw", lua_sr_pv_getw}, {"gete", lua_sr_pv_gete}, + {"getvn", lua_sr_pv_getvn}, + {"getvs", lua_sr_pv_getvs}, {"seti", lua_sr_pv_seti}, {"sets", lua_sr_pv_sets}, {"unset", lua_sr_pv_unset},

1 0

git:master:e361e5ec: tm: added fcount field for free operations debugging
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: e361e5ec2883775d14d92d46659d062b31c45f33 URL: https://github.com/kamailio/kamailio/commit/e361e5ec2883775d14d92d46659d062… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T11:02:32+02:00 tm: added fcount field for free operations debugging --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h --- Diff: https://github.com/kamailio/kamailio/commit/e361e5ec2883775d14d92d46659d062… Patch: https://github.com/kamailio/kamailio/commit/e361e5ec2883775d14d92d46659d062… --- diff --git a/src/modules/tm/h_table.c b/src/modules/tm/h_table.c index ee79b91fd3..998bdfad8e 100644 --- a/src/modules/tm/h_table.c +++ b/src/modules/tm/h_table.c @@ -143,7 +143,10 @@ void free_cell_helper( unlink_timers(dead_cell); remove_from_hash_table_unsafe(dead_cell); } - release_cell_lock(dead_cell); + release_cell_lock(dead_cell); /* does nothing */ + + dead_cell->fcount++; + if(unlikely(has_tran_tmcbs(dead_cell, TMCB_DESTROY))) run_trans_callbacks(TMCB_DESTROY, dead_cell, 0, 0, 0); diff --git a/src/modules/tm/h_table.h b/src/modules/tm/h_table.h index 7d61ae3673..a60fb9c754 100644 --- a/src/modules/tm/h_table.h +++ b/src/modules/tm/h_table.h @@ -366,6 +366,9 @@ typedef struct cell /* number of forks */ short nr_of_outgoings; + /* free operations counter - debug */ + int fcount; + #ifdef TM_DEL_UNREF /* every time the transaction/cell is referenced from somewhere this * ref_count should be increased (via REF()) and every time the reference

1 0

git:master:927d738d: tm: more debug messages for reply relay
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: 927d738d0e1585ccbccc878ab55c219ae737091d URL: https://github.com/kamailio/kamailio/commit/927d738d0e1585ccbccc878ab55c219… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T10:52:26+02:00 tm: more debug messages for reply relay --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/927d738d0e1585ccbccc878ab55c219… Patch: https://github.com/kamailio/kamailio/commit/927d738d0e1585ccbccc878ab55c219… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 474851aa7c..2f5488a309 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -315,7 +315,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) return 0; } memset(n, 0, sizeof(struct totag_elem)); - memcpy(s, tag->s, tag->len ); + memcpy(s, tag->s, tag->len); n->tag.s=s;n->tag.len=tag->len; n->next=t->fwded_totags; membar_write(); /* make sure all the changes to n are visible on all cpus @@ -328,7 +328,7 @@ inline static int update_totag_set(struct cell *t, struct sip_msg *ok) * the "readers" (unmatched_tags()) do not use locks and * can be called simultaneously on another cpu.*/ t->fwded_totags=n; - LM_DBG("new totag \n"); + LM_DBG("new totag [%.*s]\n", tag->len, tag->s); return 0; } @@ -1995,6 +1995,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (likely(uas_rb->dst.send_sock)) { if (SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0){ + LM_DBG("reply buffer sent out\n"); if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ LOCK_REPLIES( t ); @@ -2059,6 +2060,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, /* a serious error occurred -- attempt to send an error reply; * it will take care of clean-ups */ + LM_DBG("reply relay failure\n"); /* failure */ return RPS_ERROR; }

1 0

git:master:085e2c2e: core: more accurate debug messages when forwarding a reply
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: 085e2c2ea5f85616c037b083495094a2232c405a URL: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T09:11:11+02:00 core: more accurate debug messages when forwarding a reply --- Modified: src/core/forward.c --- Diff: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… Patch: https://github.com/kamailio/kamailio/commit/085e2c2ea5f85616c037b083495094a… --- diff --git a/src/core/forward.c b/src/core/forward.c index d9a778ca71..a6bf221a79 100644 --- a/src/core/forward.c +++ b/src/core/forward.c @@ -696,7 +696,7 @@ int update_sock_struct_from_via( union sockaddr_union* to, * strings; but only if host is not null terminated (host.s[len] will * always be ok for a via) */ - LM_DBG("trying SRV lookup\n"); + LM_DBG("check if dns lookup is needed for [%.*s]\n", name->len, name->s); proto=via->proto; he=sip_resolvehost(name, &port, &proto); @@ -705,6 +705,9 @@ int update_sock_struct_from_via( union sockaddr_union* to, return -1; } + LM_DBG("address is [%.*s] port %d proto %d\n", name->len, name->s, + (int)port, (int)proto); + hostent2su(to, he, 0, port); return 1; } @@ -821,14 +824,18 @@ static int do_forward_reply(struct sip_msg* msg, int mode) goto error; } + LM_DBG("reply forwarded (2nd via address: %.*s port %d)\n", + msg->via2->host.len, msg->via2->host.s, + (int) msg->via2->port); + done: #ifdef STATS STATS_TX_RESPONSE( (msg->first_line.u.reply.statuscode/100) ); #endif - LM_DBG("reply forwarded to %.*s:%d\n", + LM_DBG("reply forwarding finished (2nd via address: %.*s port %d)\n", msg->via2->host.len, msg->via2->host.s, - (unsigned short) msg->via2->port); + (int) msg->via2->port); STATS_RPL_FWD_OK(); pkg_free(new_buf);

1 0

git:master:e4d2ca28: core: debug message when dropping a sip reply
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: e4d2ca28ee2d42683d7604c6a767a201b6babbed URL: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:50:36+02:00 core: debug message when dropping a sip reply --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… Patch: https://github.com/kamailio/kamailio/commit/e4d2ca28ee2d42683d7604c6a767a20… --- diff --git a/src/core/receive.c b/src/core/receive.c index 9a385e4b85..df8db65ca6 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -415,10 +415,11 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) goto error_rpl; } else #endif /* NO_ONREPLY_ROUTE_ERROR */ - if(unlikely(ret == 0 || (ctx.run_flags & DROP_R_F))) { - STATS_RPL_FWD_DROP(); - goto skip_send_reply; /* drop the message, no error */ - } + if(unlikely(ret == 0 || (ctx.run_flags & DROP_R_F))) { + STATS_RPL_FWD_DROP(); + LM_DBG("drop flag set - skip forwarding the reply\n"); + goto skip_send_reply; /* drop the message, no error */ + } } /* send the msg */ forward_reply(msg);

1 0

git:master:f3312715: app_lua: split function for returning pv null value
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: f3312715943867f76c8753eba992dad5859d8c2f URL: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:38:00+02:00 app_lua: split function for returning pv null value --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… Patch: https://github.com/kamailio/kamailio/commit/f3312715943867f76c8753eba992dad… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index dc2aa8644f..a57f94fcc7 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -885,6 +885,22 @@ static const luaL_Reg _sr_hdr_Map [] = { }; +/** + * + */ +static int lua_sr_pv_push_val_null (lua_State *L, int rmode) +{ + if(rmode==1) { + lua_pushlstring(L, "<<null>>", 8); + return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; + } else { + return 0; + } +} + /** * */ @@ -900,15 +916,7 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvn.s = (char*)lua_tostring(L, -1); if(pvn.s==NULL || env_L->msg==NULL) { - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } pvn.len = strlen(pvn.s); @@ -916,52 +924,20 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } if(val.flags&PV_VAL_NULL) { - if(rmode==1) { - lua_pushlstring(L, "<<null>>", 8); - return 1; - } else if(rmode==2) { - lua_pushlstring(L, "", 0); - return 1; - } else { - return 0; - } + return lua_sr_pv_push_val_null(L, rmode); } if(val.flags&PV_TYPE_INT) { lua_pushinteger(L, val.ri);

1 0

git:master:b98cb43b: app_lua: kemi - exported KSR.pv.getw("$...")
by Daniel-Constantin Mierla 24 Aug '18

24 Aug '18

Module: kamailio Branch: master Commit: b98cb43b1ea33706fe133f6585c0705892663ae6 URL: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-24T08:20:17+02:00 app_lua: kemi - exported KSR.pv.getw("$...") - get the value of the pseudo-variable if it is not $null and the empty string ("") if it is $null --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… Patch: https://github.com/kamailio/kamailio/commit/b98cb43b1ea33706fe133f6585c0705… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 4414bd83a2..dc2aa8644f 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -900,9 +900,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvn.s = (char*)lua_tostring(L, -1); if(pvn.s==NULL || env_L->msg==NULL) { - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -913,9 +916,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pl = pv_locate_name(&pvn); if(pl != pvn.len) { LM_ERR("invalid pv [%s] (%d/%d)\n", pvn.s, pl, pvn.len); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -923,9 +929,12 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) pvs = pv_cache_get(&pvn); if(pvs==NULL) { LM_ERR("cannot get pv spec for [%s]\n", pvn.s); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -933,17 +942,23 @@ static int lua_sr_pv_get_val (lua_State *L, int rmode) memset(&val, 0, sizeof(pv_value_t)); if(pv_get_spec_value(env_L->msg, pvs, &val) != 0) { LM_ERR("unable to get pv value for [%s]\n", pvn.s); - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } } if(val.flags&PV_VAL_NULL) { - if(rmode) { + if(rmode==1) { lua_pushlstring(L, "<<null>>", 8); return 1; + } else if(rmode==2) { + lua_pushlstring(L, "", 0); + return 1; } else { return 0; } @@ -972,6 +987,14 @@ static int lua_sr_pv_getw (lua_State *L) return lua_sr_pv_get_val(L, 1); } +/** + * + */ +static int lua_sr_pv_gete (lua_State *L) +{ + return lua_sr_pv_get_val(L, 2); +} + /** * */ @@ -1179,6 +1202,7 @@ static int lua_sr_pv_is_null (lua_State *L) static const luaL_Reg _sr_pv_Map [] = { {"get", lua_sr_pv_get}, {"getw", lua_sr_pv_getw}, + {"gete", lua_sr_pv_gete}, {"seti", lua_sr_pv_seti}, {"sets", lua_sr_pv_sets}, {"unset", lua_sr_pv_unset},

1 0

git:5.0:7ab0b1c0: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: 5.0 Commit: 7ab0b1c0fa4028d7d4abb1b621b364584ae0f4b9 URL: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-23T20:00:58+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… Patch: https://github.com/kamailio/kamailio/commit/7ab0b1c0fa4028d7d4abb1b621b3645… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 07bd518d64..305ed4f14b 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -115,7 +115,7 @@ get_prefix( if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

git:5.1:ff36d82d: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: 5.1 Commit: ff36d82d8861ed50adf91b9e314c29ef8ee3e745 URL: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-08-23T20:00:40+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio (cherry picked from commit e4f3849f35ae556e317c365d56b14212e48d1dab) --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… Patch: https://github.com/kamailio/kamailio/commit/ff36d82d8861ed50adf91b9e314c29e… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

git:master:e4f3849f: drouting: fix crush for empty username in ruri
by Henning Westerholt 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: e4f3849f35ae556e317c365d56b14212e48d1dab URL: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Committer: Henning Westerholt <henningw(a)users.noreply.github.com> Date: 2018-08-23T19:59:30+02:00 drouting: fix crush for empty username in ruri - uri like sip:@host crushed kamailio --- Modified: src/modules/drouting/prefix_tree.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… Patch: https://github.com/kamailio/kamailio/commit/e4f3849f35ae556e317c365d56b1421… --- diff --git a/src/modules/drouting/prefix_tree.c b/src/modules/drouting/prefix_tree.c index 099c402dec..9ce8d04bc6 100644 --- a/src/modules/drouting/prefix_tree.c +++ b/src/modules/drouting/prefix_tree.c @@ -98,7 +98,7 @@ rt_info_t *get_prefix(ptree_t *ptree, str *prefix, unsigned int rgid) if(NULL == ptree) goto err_exit; - if(NULL == prefix) + if(NULL == prefix || NULL == prefix->s) goto err_exit; tmp = prefix->s; /* go the tree down to the last digit in the

1 0

[kamailio/kamailio] drouting: fix crush for empty username in ruri (#1625)
by Dmitri Savolainen 23 Aug '18

23 Aug '18

- uri like sip:@host crushed kamailio #### 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:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1625 -- Commit Summary -- * drouting: fix crush for empty username in ruri -- File Changes -- M src/modules/drouting/prefix_tree.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1625.patch https://github.com/kamailio/kamailio/pull/1625.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/1625

2 2

git:master:f8220f53: modules: readme files regenerated - misc_radius ... [skip ci]
by Kamailio Dev 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: f8220f53da4494d88e3b371d4cfc6a6b3baca909 URL: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-23T17:16:52+02:00 modules: readme files regenerated - misc_radius ... [skip ci] --- Modified: src/modules/misc_radius/README --- Diff: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… Patch: https://github.com/kamailio/kamailio/commit/f8220f53da4494d88e3b371d4cfc6a6… --- diff --git a/src/modules/misc_radius/README b/src/modules/misc_radius/README index 129ca733c7..ec165d9cdd 100644 --- a/src/modules/misc_radius/README +++ b/src/modules/misc_radius/README @@ -326,16 +326,16 @@ radius_load_caller_avps($fU); Sending Access-Accept of id 60 to 192.168.25.32 port 59736 Session-Timeout = 4261674 next-hop-ip = "SIP/00111222333444@cisco-out" - SIP-AVP = "email:sr-users@lists.sip-router.org session-timeout#161 next-hop- -ip:h323/0001111@myvoip-gate.kamailio.org" + SIP-AVP = "email:sr-users@lists.kamailio.org session-timeout#161 next-hop-ip +:h323/0001111@myvoip-gate.kamailio.org" session-protocol = "SIP" ... $avp(Session-Timeout) has integer value 4261674 $avp(next-hop-ip) has string value "SIP/005555777888@cisco-out" $avp(session-protocol) has string value "SIP" -$avp(SIP-AVP) has string value "email:sr-users@lists.sip-router.org session-tim -eout#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" +$avp(SIP-AVP) has string value "email:sr-users@lists.kamailio.org session-timeo +ut#161 next-hop-ip:h323/0001111@myvoip-gate.kamailio.org" ... When receiving negative response, check appropriate avp's:

1 0

git:master:b2b2b981: update mailing list URL
by Victor Seva 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: b2b2b981e641eb3b83dd9afd09c8668b8a239741 URL: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-08-23T16:59:11+02:00 update mailing list URL --- Modified: .github/ISSUE_TEMPLATE.md Modified: INSTALL Modified: ISSUES Modified: doc/README.md Modified: doc/man/kamailio.8 Modified: doc/man/kamailio.cfg.5 Modified: doc/tutorials/presence/trouble.xml Modified: etc/sip-router.cfg Modified: misc/examples/ims/icscf/kamailio.cfg Modified: misc/examples/ims/scscf/kamailio.cfg Modified: misc/examples/kemi/kamailio-basic-kemi.cfg Modified: misc/examples/pkg/sip-router-basic.cfg Modified: misc/examples/pkg/sip-router-oob.cfg Modified: misc/tls-ca/README Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/xenial/copyright Modified: src/modules/cnxcc/example/kamailio-cnxcc.cfg Modified: src/modules/db_cassandra/kamailio_cassa.cfg Modified: src/modules/dispatcher/doc/dispatcher.cfg Modified: src/modules/ims_ocs/examples/full/kamailio.cfg Modified: src/modules/ims_ocs/examples/simple/kamailio.cfg Modified: src/modules/misc_radius/doc/misc_radius_admin.xml Modified: src/modules/smsops/examples/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668… Patch: https://github.com/kamailio/kamailio/commit/b2b2b981e641eb3b83dd9afd09c8668…

1 0

git:master:26449dc2: modules/auth: fixed path in auth.xml
by Juha Heinanen 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: 26449dc2da3b47dd71265e8103de5957bd2245f4 URL: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de595… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-08-23T11:53:34+03:00 modules/auth: fixed path in auth.xml --- Modified: src/modules/auth/auth.xml --- Diff: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de595… Patch: https://github.com/kamailio/kamailio/commit/26449dc2da3b47dd71265e8103de595… --- diff --git a/src/modules/auth/auth.xml b/src/modules/auth/auth.xml index 6f5f001d1c..1470f7c9d9 100644 --- a/src/modules/auth/auth.xml +++ b/src/modules/auth/auth.xml @@ -3,7 +3,7 @@ "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [  -<!ENTITY % docentities SYSTEM "../../../../doc/docbook/entities.xml"> +<!ENTITY % docentities SYSTEM "../../../doc/docbook/entities.xml"> %docentities; ]>

1 0

git:master:e2994b6a: ims_ipsec_pcscf: Fix memory leaks in cmd.c
by Tsvetomir Dimitrov 23 Aug '18

23 Aug '18

Module: kamailio Branch: master Commit: e2994b6ac4846c869894a2783304782854f96f57 URL: https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-08-23T10:57:44+03:00 ims_ipsec_pcscf: Fix memory leaks in cmd.c --- Modified: src/modules/ims_ipsec_pcscf/cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782… Patch: https://github.com/kamailio/kamailio/commit/e2994b6ac4846c869894a2783304782… --- diff --git a/src/modules/ims_ipsec_pcscf/cmd.c b/src/modules/ims_ipsec_pcscf/cmd.c index b5741e30d8..46056b9214 100644 --- a/src/modules/ims_ipsec_pcscf/cmd.c +++ b/src/modules/ims_ipsec_pcscf/cmd.c @@ -161,7 +161,7 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) cb = cscf_parse_contacts(req); if (!cb || (!cb->contacts)) { LM_ERR("fill_contact(): No contact headers\n"); - return -3; + return -1; } // populate CI with bare minimum @@ -172,8 +172,11 @@ static int fill_contact(struct pcontact_info* ci, struct sip_msg* m) } - char* srcip; - srcip = pkg_malloc(50); + char* srcip = NULL; + if((srcip = pkg_malloc(50)) == NULL) { + LM_ERR("Error allocating memory for source IP address\n"); + return -1; + } ci->received_host.len = ip_addr2sbuf(&req->rcv.src_ip, srcip, 50); ci->received_host.s = srcip; @@ -386,6 +389,7 @@ int add_security_server_header(struct sip_msg* m, ipsec_t* s) // copy to the header and add if((sec_header->s = pkg_malloc(sec_header->len)) == NULL) { LM_ERR("Error allocating pkg memory for security header payload\n"); + pkg_free(sec_header); return -1; } memcpy(sec_header->s, sec_hdr_buf, sec_header->len); @@ -393,6 +397,8 @@ int add_security_server_header(struct sip_msg* m, ipsec_t* s) // add security-server header in reply if(cscf_add_header(m, sec_header, HDR_OTHER_T) != 1) { LM_ERR("Error adding security header to reply!\n"); + pkg_free(sec_header->s); + pkg_free(sec_header); return -1; }

1 0

Build failed in Jenkins: kamailio51-binaries » i386,buster,slave #5
by jenkins＠sipwise.com 22 Aug '18

22 Aug '18

See <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> ------------------------------------------ [...truncated 153.96 KB...] + '[' -n '' ']' + '[' -n '' ']' ++ date + echo '# pbuilder config file generated by jenkins-debian-glue on Tue Jun 5 14:33:14 UTC 2018' + '[' -n '' ']' + use_eatmydata + '[' '' = false ']' + '[' '' = true ']' + dpkg-query --show '--showformat=${Status}' eatmydata + grep -q '^install' ++ dpkg-query --show '--showformat=${Version}' eatmydata + dpkg --compare-versions 82-6 gt 26-2 + echo '*** eatmydata is present on host system, now checking distribution support ***' *** eatmydata is present on host system, now checking distribution support *** + case "${COWBUILDER_DIST}" in + echo '*** Distribution buster should provide recent eatmydata support, enabling eatmydata ***' *** Distribution buster should provide recent eatmydata support, enabling eatmydata *** + enable_eatmydata + echo 'EXTRAPACKAGES="$EXTRAPACKAGES eatmydata"' + echo 'export LD_PRELOAD="${LD_PRELOAD:+$LD_PRELOAD:}libeatmydata.so"' + echo '# builtin support available with pbuilder >=0.225 (otherwise ignored):' + echo EATMYDATA=yes + use_ccache + '[' '' = true ']' + '[' -n /etc/jenkins/pbuilderrc ']' + echo '*** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config ***' *** PBUILDER_CONFIG is set, considering /etc/jenkins/pbuilderrc for pbuilder config *** + '[' -r /etc/jenkins/pbuilderrc ']' + echo '*** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile ***' *** Adding content of /etc/jenkins/pbuilderrc to pbuilder configfile *** + cat /etc/jenkins/pbuilderrc + counter=3600 + ls '/var/run/lock/buster-i386.update.*' + '[' 3600 -eq 0 ']' + touch /var/run/lock/buster-i386.building.931 + case "$architecture" in + linux32 sudo DIST=buster ARCH=i386 cowbuilder --buildresult <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> --build <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> --basepath /var/cache/pbuilder/base-buster-i386.cow --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts '/tmp/apt-jdg_PCk8AQ ' --configfile=/tmp/tmp.xPZCwzG34W -> Copying COW directory forking: rm -rf /var/cache/pbuilder/build//cow.1591 forking: cp -al /var/cache/pbuilder/base-buster-i386.cow /var/cache/pbuilder/build//cow.1591 I: removed stale ilistfile /var/cache/pbuilder/build//cow.1591/.ilist forking: chroot /var/cache/pbuilder/build//cow.1591 cowdancer-ilistcreate /.ilist find . -xdev -path ./home -prune -o $ \( -type l -o -type f $ -a -links +1 -print0 \) | xargs -0 stat --format '%d %i ' -> Invoking pbuilder forking: pbuilder build --debbuildopts -B --hookdir /usr/share/jenkins-debian-glue/pbuilder-hookdir/ --bindmounts /tmp/apt-jdg_PCk8AQ --configfile /tmp/tmp.xPZCwzG34W --buildplace /var/cache/pbuilder/build//cow.1591 --buildresult <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> --debbuildopts -B --no-targz --internal-chrootexec chroot /var/cache/pbuilder/build//cow.1591 cow-shell <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> W: /root/.pbuilderrc does not exist I: Running in no-targz mode I: using fakeroot in build. I: pbuilder: network access will be disabled during build I: Current time: Tue Jun 5 14:33:15 UTC 2018 I: pbuilder-time-stamp: 1528209195 I: copying local configuration I: mounting /proc filesystem I: mounting /run/shm filesystem I: mounting /dev/pts filesystem I: Mounting /tmp/apt-jdg_PCk8AQ I: policy-rc.d already exists I: Obtaining the cached apt archive contents I: Installing the build-deps I: user script /var/cache/pbuilder/build/cow.1591/tmp/hooks/D10-man-db starting I: Preseed man-db/auto-update to false I: user script /var/cache/pbuilder/build/cow.1591/tmp/hooks/D10-man-db finished I: user script /var/cache/pbuilder/build/cow.1591/tmp/hooks/D20releaserepo starting + set -- /tmp/apt-jdg_PCk8AQ/ + TMPAPT=/tmp/apt-jdg_PCk8AQ/ + [ -d /tmp/apt-jdg_PCk8AQ/ ] + UPDATE_PKGLIST=0 + ls /tmp/apt-jdg_PCk8AQ/*.list + [ -e /tmp/apt-jdg_PCk8AQ//keyring.gpg ] + [ 0 = 1 ] I: user script /var/cache/pbuilder/build/cow.1591/tmp/hooks/D20releaserepo finished -> Attempting to satisfy build-dependencies -> Creating pbuilder-satisfydepends-dummy package Package: pbuilder-satisfydepends-dummy Version: 0.invalid.0 Architecture: i386 Maintainer: Debian Pbuilder Team <pbuilder-maint(a)lists.alioth.debian.org> Description: Dummy package to satisfy dependencies with aptitude - created by pbuilder This package was created automatically by pbuilder to satisfy the build-dependencies of the package being currently built. Depends: bison, debhelper (>= 9), default-libmysqlclient-dev, dh-systemd (>= 1.5), docbook-xml, dpkg-dev (>= 1.16.1.1), erlang-dev, flex, gcj-jdk, libconfuse-dev, libcurl4-openssl-dev, libdb-dev (>= 4.6.19), libev-dev, libevent-dev, libexpat1-dev, libgeoip-dev (>= 1.4.5), libhiredis-dev (>= 0.10.0), libjansson-dev, libjson-c-dev, libldap2-dev, liblua5.1-0-dev, libmaxminddb-dev, libmemcached-dev, libmongoc-dev, libmono-2.0-dev, libncurses5-dev, libpcre3-dev, libperl-dev, libphonenumber-dev (>= 7), libpq-dev, librabbitmq-dev, libradcli-dev, libreadline-dev, libsasl2-dev, libsctp-dev, libsnmp-dev, libsqlite3-dev, libssl-dev, libsystemd-dev, libunistring-dev, libxml2-dev, openssl, pkg-config, python, python-dev, unixodbc-dev, uuid-dev, xsltproc, zlib1g-dev dpkg-deb: building package 'pbuilder-satisfydepends-dummy' in '/tmp/satisfydepends-aptitude/pbuilder-satisfydepends-dummy.deb'. Selecting previously unselected package pbuilder-satisfydepends-dummy. (Reading database ... 12170 files and directories currently installed.) Preparing to unpack .../pbuilder-satisfydepends-dummy.deb ... Unpacking pbuilder-satisfydepends-dummy (0.invalid.0) ... dpkg: pbuilder-satisfydepends-dummy: dependency problems, but configuring anyway as you requested: pbuilder-satisfydepends-dummy depends on bison; however: Package bison is not installed. pbuilder-satisfydepends-dummy depends on debhelper (>= 9); however: Package debhelper is not installed. pbuilder-satisfydepends-dummy depends on default-libmysqlclient-dev; however: Package default-libmysqlclient-dev is not installed. pbuilder-satisfydepends-dummy depends on dh-systemd (>= 1.5); however: Package dh-systemd is not installed. pbuilder-satisfydepends-dummy depends on docbook-xml; however: Package docbook-xml is not installed. pbuilder-satisfydepends-dummy depends on erlang-dev; however: Package erlang-dev is not installed. pbuilder-satisfydepends-dummy depends on flex; however: Package flex is not installed. pbuilder-satisfydepends-dummy depends on gcj-jdk; however: Package gcj-jdk is not installed. pbuilder-satisfydepends-dummy depends on libconfuse-dev; however: Package libconfuse-dev is not installed. pbuilder-satisfydepends-dummy depends on libcurl4-openssl-dev; however: Package libcurl4-openssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libdb-dev (>= 4.6.19); however: Package libdb-dev is not installed. pbuilder-satisfydepends-dummy depends on libev-dev; however: Package libev-dev is not installed. pbuilder-satisfydepends-dummy depends on libevent-dev; however: Package libevent-dev is not installed. pbuilder-satisfydepends-dummy depends on libexpat1-dev; however: Package libexpat1-dev is not installed. pbuilder-satisfydepends-dummy depends on libgeoip-dev (>= 1.4.5); however: Package libgeoip-dev is not installed. pbuilder-satisfydepends-dummy depends on libhiredis-dev (>= 0.10.0); however: Package libhiredis-dev is not installed. pbuilder-satisfydepends-dummy depends on libjansson-dev; however: Package libjansson-dev is not installed. pbuilder-satisfydepends-dummy depends on libjson-c-dev; however: Package libjson-c-dev is not installed. pbuilder-satisfydepends-dummy depends on libldap2-dev; however: Package libldap2-dev is not installed. pbuilder-satisfydepends-dummy depends on liblua5.1-0-dev; however: Package liblua5.1-0-dev is not installed. pbuilder-satisfydepends-dummy depends on libmaxminddb-dev; however: Package libmaxminddb-dev is not installed. pbuilder-satisfydepends-dummy depends on libmemcached-dev; however: Package libmemcached-dev is not installed. pbuilder-satisfydepends-dummy depends on libmongoc-dev; however: Package libmongoc-dev is not installed. pbuilder-satisfydepends-dummy depends on libmono-2.0-dev; however: Package libmono-2.0-dev is not installed. pbuilder-satisfydepends-dummy depends on libncurses5-dev; however: Package libncurses5-dev is not installed. pbuilder-satisfydepends-dummy depends on libpcre3-dev; however: Package libpcre3-dev is not installed. pbuilder-satisfydepends-dummy depends on libperl-dev; however: Package libperl-dev is not installed. pbuilder-satisfydepends-dummy depends on libphonenumber-dev (>= 7); however: Package libphonenumber-dev is not installed. pbuilder-satisfydepends-dummy depends on libpq-dev; however: Package libpq-dev is not installed. pbuilder-satisfydepends-dummy depends on librabbitmq-dev; however: Package librabbitmq-dev is not installed. pbuilder-satisfydepends-dummy depends on libradcli-dev; however: Package libradcli-dev is not installed. pbuilder-satisfydepends-dummy depends on libreadline-dev; however: Package libreadline-dev is not installed. pbuilder-satisfydepends-dummy depends on libsasl2-dev; however: Package libsasl2-dev is not installed. pbuilder-satisfydepends-dummy depends on libsctp-dev; however: Package libsctp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsnmp-dev; however: Package libsnmp-dev is not installed. pbuilder-satisfydepends-dummy depends on libsqlite3-dev; however: Package libsqlite3-dev is not installed. pbuilder-satisfydepends-dummy depends on libssl-dev; however: Package libssl-dev is not installed. pbuilder-satisfydepends-dummy depends on libsystemd-dev; however: Package libsystemd-dev is not installed. pbuilder-satisfydepends-dummy depends on libunistring-dev; however: Package libunistring-dev is not installed. pbuilder-satisfydepends-dummy depends on libxml2-dev; however: Package libxml2-dev is not installed. pbuilder-satisfydepends-dummy depends on openssl; however: Package openssl is not installed. pbuilder-satisfydepends-dummy depends on pkg-config; however: Package pkg-config is not installed. pbuilder-satisfydepends-dummy depends on python; however: Package python is not installed. pbuilder-satisfydepends-dummy depends on python-dev; however: Package python-dev is not installed. pbuilder-satisfydepends-dummy depends on unixodbc-dev; however: Package unixodbc-dev is not installed. pbuilder-satisfydepends-dummy depends on uuid-dev; however: Package uuid-dev is not installed. pbuilder-satisfydepends-dummy depends on xsltproc; however: Package xsltproc is not installed. pbuilder-satisfydepends-dummy depends on zlib1g-dev; however: Package zlib1g-dev is not installed. Setting up pbuilder-satisfydepends-dummy (0.invalid.0) ... Reading package lists... Building dependency tree... Reading state information... Initializing package states... Writing extended state information... Building tag database... pbuilder-satisfydepends-dummy is already installed at the requested version (0.invalid.0) pbuilder-satisfydepends-dummy is already installed at the requested version (0.invalid.0) The following NEW packages will be installed: autoconf{a} automake{a} autopoint{a} autotools-dev{a} bison{a} bsdmainutils{a} debhelper{a} default-libmysqlclient-dev{a} dh-autoreconf{a} dh-strip-nondeterminism{a} dh-systemd{a} docbook-xml{a} dwz{a} erlang-base{a} erlang-dev{a} file{a} flex{a} geoip-bin{a} gettext{a} gettext-base{a} gir1.2-glib-2.0{a} gir1.2-harfbuzz-0.0{a} groff-base{a} icu-devtools{a} intltool-debian{a} libarchive-zip-perl{a} libbison-dev{a} libboost-atomic1.62-dev{a} libboost-atomic1.62.0{a} libboost-chrono1.62-dev{a} libboost-chrono1.62.0{a} libboost-date-time1.62-dev{a} libboost-date-time1.62.0{a} libboost-dev{a} libboost-serialization1.62-dev{a} libboost-serialization1.62.0{a} libboost-system-dev{a} libboost-system1.62-dev{a} libboost-thread-dev{a} libboost-thread1.62-dev{a} libboost-thread1.62.0{a} libboost1.62-dev{a} libbsd0{a} libbson-1.0-0{a} libbson-dev{a} libconfuse-common{a} libconfuse-dev{a} libconfuse2{a} libcroco3{a} libcurl4{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb5.3-dev{a} libelf1{a} libev-dev{a} libev4{a} libevent-2.1-6{a} libevent-core-2.1-6{a} libevent-dev{a} libevent-extra-2.1-6{a} libevent-openssl-2.1-6{a} libevent-pthreads-2.1-6{a} libexpat1{a} libexpat1-dev{a} libfile-stripnondeterminism-perl{a} libfreetype6{a} libgeocoding7{a} libgeoip-dev{a} libgeoip1{a} libgirepository-1.0-1{a} libglib2.0-0{a} libglib2.0-bin{a} libglib2.0-data{a} libglib2.0-dev{a} libglib2.0-dev-bin{a} libgraphite2-3{a} libgraphite2-dev{a} libgssapi-krb5-2{a} libharfbuzz-dev{a} libharfbuzz-gobject0{a} libharfbuzz-icu0{a} libharfbuzz0b{a} libhashkit-dev{a} libhashkit2{a} libhiredis-dev{a} libhiredis0.13{a} libicu-dev{a} libicu-le-hb-dev{a} libicu-le-hb0{a} libicu60{a} libjansson-dev{a} libjansson4{a} libjson-c-dev{a} libjson-c3{a} libk5crypto3{a} libkeyutils1{a} libkrb5-3{a} libkrb5support0{a} libldap-2.4-2{a} libldap-common{a} libldap2-dev{a} libltdl-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic-mgc{a} libmagic1{a} libmariadbclient-dev{a} libmariadbclient-dev-compat{a} libmariadbclient18{a} libmaxminddb-dev{a} libmaxminddb0{a} libmemcached-dev{a} libmemcached11{a} libmemcachedutil2{a} libmongoc-1.0-0{a} libmongoc-dev{a} libmono-2.0-dev{a} libmonosgen-2.0-1{a} libmonosgen-2.0-dev{a} libmpdec2{a} libncurses-dev{a} libnghttp2-14{a} libodbc1{a} libpci-dev{a} libpci3{a} libpcre16-3{a} libpcre3-dev{a} libpcre32-3{a} libpcrecpp0v5{a} libperl-dev{a} libphonenumber-dev{a} libphonenumber7{a} libpipeline1{a} libpng16-16{a} libpq-dev{a} libpq5{a} libprocps7{a} libprotobuf-dev{a} libprotobuf-lite10{a} libprotobuf10{a} libpsl5{a} libpython-dev{a} libpython-stdlib{a} libpython2.7{a} libpython2.7-dev{a} libpython2.7-minimal{a} libpython2.7-stdlib{a} libpython3-stdlib{a} libpython3.6-minimal{a} libpython3.6-stdlib{a} librabbitmq-dev{a} librabbitmq4{a} libradcli-dev{a} libradcli4{a} libreadline-dev{a} libreadline7{a} librtmp1{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules-db{a} libsctp-dev{a} libsctp1{a} libsensors4{a} libsensors4-dev{a} libsigsegv2{a} libsnappy-dev{a} libsnappy1v5{a} libsnmp-base{a} libsnmp-dev{a} libsnmp30{a} libsqlite3-dev{a} libssh2-1{a} libssl-dev{a} libssl1.1{a} libsystemd-dev{a} libtimedate-perl{a} libtool{a} libudev-dev{a} libunistring-dev{a} libwrap0{a} libwrap0-dev{a} libxml2{a} libxml2-dev{a} libxslt1.1{a} m4{a} man-db{a} mime-support{a} mysql-common{a} odbcinst{a} odbcinst1debian2{a} openssl{a} pkg-config{a} po-debconf{a} procps{a} python{a} python-dev{a} python-minimal{a} python2.7{a} python2.7-dev{a} python2.7-minimal{a} python3{a} python3-distutils{a} python3-lib2to3{a} python3-minimal{a} python3.6{a} python3.6-minimal{a} readline-common{a} sgml-base{a} sgml-data{a} unixodbc-dev{a} uuid-dev{a} xml-core{a} xsltproc{a} zlib1g-dev{a} The following packages are RECOMMENDED but will NOT be installed: ca-certificates curl erlang-crypto erlang-syntax-tools geoip-database krb5-locales libarchive-cpio-perl libconfuse-doc libfl-dev libmail-sendmail-perl libsasl2-modules libtool-bin lynx psmisc publicsuffix shared-mime-info wget xdg-user-dirs 0 packages upgraded, 215 newly installed, 0 to remove and 0 not upgraded. Need to get 136 MB of archives. After unpacking 507 MB will be used. The following packages have unmet dependencies: pbuilder-satisfydepends-dummy : Depends: gcj-jdk which is a virtual package and is not provided by any available package Unable to resolve dependencies! Giving up... The following NEW packages will be installed: autoconf{a} automake{a} autopoint{a} autotools-dev{a} bison{a} bsdmainutils{a} debhelper{a} default-libmysqlclient-dev{a} dh-autoreconf{a} dh-strip-nondeterminism{a} dh-systemd{a} docbook-xml{a} dwz{a} erlang-base{a} erlang-dev{a} file{a} flex{a} geoip-bin{a} gettext{a} gettext-base{a} gir1.2-glib-2.0{a} gir1.2-harfbuzz-0.0{a} groff-base{a} icu-devtools{a} intltool-debian{a} libarchive-zip-perl{a} libbison-dev{a} libboost-atomic1.62-dev{a} libboost-atomic1.62.0{a} libboost-chrono1.62-dev{a} libboost-chrono1.62.0{a} libboost-date-time1.62-dev{a} libboost-date-time1.62.0{a} libboost-dev{a} libboost-serialization1.62-dev{a} libboost-serialization1.62.0{a} libboost-system-dev{a} libboost-system1.62-dev{a} libboost-thread-dev{a} libboost-thread1.62-dev{a} libboost-thread1.62.0{a} libboost1.62-dev{a} libbsd0{a} libbson-1.0-0{a} libbson-dev{a} libconfuse-common{a} libconfuse-dev{a} libconfuse2{a} libcroco3{a} libcurl4{a} libcurl4-openssl-dev{a} libdb-dev{a} libdb5.3-dev{a} libelf1{a} libev-dev{a} libev4{a} libevent-2.1-6{a} libevent-core-2.1-6{a} libevent-dev{a} libevent-extra-2.1-6{a} libevent-openssl-2.1-6{a} libevent-pthreads-2.1-6{a} libexpat1{a} libexpat1-dev{a} libfile-stripnondeterminism-perl{a} libfreetype6{a} libgeocoding7{a} libgeoip-dev{a} libgeoip1{a} libgirepository-1.0-1{a} libglib2.0-0{a} libglib2.0-bin{a} libglib2.0-data{a} libglib2.0-dev{a} libglib2.0-dev-bin{a} libgraphite2-3{a} libgraphite2-dev{a} libgssapi-krb5-2{a} libharfbuzz-dev{a} libharfbuzz-gobject0{a} libharfbuzz-icu0{a} libharfbuzz0b{a} libhashkit-dev{a} libhashkit2{a} libhiredis-dev{a} libhiredis0.13{a} libicu-dev{a} libicu-le-hb-dev{a} libicu-le-hb0{a} libicu60{a} libjansson-dev{a} libjansson4{a} libjson-c-dev{a} libjson-c3{a} libk5crypto3{a} libkeyutils1{a} libkrb5-3{a} libkrb5support0{a} libldap-2.4-2{a} libldap-common{a} libldap2-dev{a} libltdl-dev{a} libltdl7{a} liblua5.1-0{a} liblua5.1-0-dev{a} libmagic-mgc{a} libmagic1{a} libmariadbclient-dev{a} libmariadbclient-dev-compat{a} libmariadbclient18{a} libmaxminddb-dev{a} libmaxminddb0{a} libmemcached-dev{a} libmemcached11{a} libmemcachedutil2{a} libmongoc-1.0-0{a} libmongoc-dev{a} libmono-2.0-dev{a} libmonosgen-2.0-1{a} libmonosgen-2.0-dev{a} libmpdec2{a} libncurses-dev{a} libnghttp2-14{a} libodbc1{a} libpci-dev{a} libpci3{a} libpcre16-3{a} libpcre3-dev{a} libpcre32-3{a} libpcrecpp0v5{a} libperl-dev{a} libphonenumber-dev{a} libphonenumber7{a} libpipeline1{a} libpng16-16{a} libpq-dev{a} libpq5{a} libprocps7{a} libprotobuf-dev{a} libprotobuf-lite10{a} libprotobuf10{a} libpsl5{a} libpython-dev{a} libpython-stdlib{a} libpython2.7{a} libpython2.7-dev{a} libpython2.7-minimal{a} libpython2.7-stdlib{a} libpython3-stdlib{a} libpython3.6-minimal{a} libpython3.6-stdlib{a} librabbitmq-dev{a} librabbitmq4{a} libradcli-dev{a} libradcli4{a} libreadline-dev{a} libreadline7{a} librtmp1{a} libsasl2-2{a} libsasl2-dev{a} libsasl2-modules-db{a} libsctp-dev{a} libsctp1{a} libsensors4{a} libsensors4-dev{a} libsigsegv2{a} libsnappy-dev{a} libsnappy1v5{a} libsnmp-base{a} libsnmp-dev{a} libsnmp30{a} libsqlite3-dev{a} libssh2-1{a} libssl-dev{a} libssl1.1{a} libsystemd-dev{a} libtimedate-perl{a} libtool{a} libudev-dev{a} libunistring-dev{a} libwrap0{a} libwrap0-dev{a} libxml2{a} libxml2-dev{a} libxslt1.1{a} m4{a} man-db{a} mime-support{a} mysql-common{a} odbcinst{a} odbcinst1debian2{a} openssl{a} pkg-config{a} po-debconf{a} procps{a} python{a} python-dev{a} python-minimal{a} python2.7{a} python2.7-dev{a} python2.7-minimal{a} python3{a} python3-distutils{a} python3-lib2to3{a} python3-minimal{a} python3.6{a} python3.6-minimal{a} readline-common{a} sgml-base{a} sgml-data{a} unixodbc-dev{a} uuid-dev{a} xml-core{a} xsltproc{a} zlib1g-dev{a} The following packages are RECOMMENDED but will NOT be installed: ca-certificates curl erlang-crypto erlang-syntax-tools geoip-database krb5-locales libarchive-cpio-perl libconfuse-doc libfl-dev libmail-sendmail-perl libsasl2-modules libtool-bin lynx psmisc publicsuffix shared-mime-info wget xdg-user-dirs 0 packages upgraded, 215 newly installed, 0 to remove and 0 not upgraded. Need to get 136 MB of archives. After unpacking 507 MB will be used. Abort. E: pbuilder-satisfydepends failed. I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_PCk8AQ filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.1591 + '[' 1 -eq 0 ']' + bailout 1 'Error: Failed to build with cowbuilder.' + '[' -n 1 ']' + EXIT=1 + '[' -n 'Error: Failed to build with cowbuilder.' ']' + echo 'Error: Failed to build with cowbuilder.' Error: Failed to build with cowbuilder. + rm -f /var/run/lock/buster-i386.building.931 + '[' -r /var/run/lock/buster-i386.update.931 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailio51-binaries/architecture=i386,dist…'> + '[' -n /tmp/tmp.xPZCwzG34W ']' + rm -rf /tmp/tmp.xPZCwzG34W + '[' -n /tmp/apt-jdg_PCk8AQ ']' + sudo rm -rf /tmp/apt-jdg_PCk8AQ + '[' -n 307161 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=10 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Jun 5 14:33:19 UTC 2018 [running 10 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Jun 5 14:33:19 UTC 2018 [running 10 seconds] *** + exit 1 Build step 'Execute shell' marked build as failure Archiving artifacts Recording fingerprints TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap Did not find any matching files. Recording test results ERROR: Step ‘Publish JUnit test result report’ failed: No test report files were found. Configuration error?

1 1

git:master:bf6d926d: jansson: exported jansson_get(...) to kemi framework
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: bf6d926d5d22f99c1a2776aaeb9ec705b58592c5 URL: https://github.com/kamailio/kamailio/commit/bf6d926d5d22f99c1a2776aaeb9ec70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T16:50:22+02:00 jansson: exported jansson_get(...) to kemi framework - jansson.get(...) --- Modified: src/modules/jansson/jansson_funcs.c Modified: src/modules/jansson/jansson_funcs.h Modified: src/modules/jansson/jansson_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf6d926d5d22f99c1a2776aaeb9ec70… Patch: https://github.com/kamailio/kamailio/commit/bf6d926d5d22f99c1a2776aaeb9ec70… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 9f82243114..012f1aba40 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -31,38 +31,23 @@ #include "jansson_funcs.h" #include "jansson_utils.h" -int janssonmod_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) +int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *dst_pv) { - str src_s; - str path_s; - pv_spec_t *dst_pv; - pv_value_t dst_val; - - if (fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { - ERR("cannot get json string value\n"); - return -1; - } - - if (fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { - ERR("cannot get path string value\n"); - return -1; - } - - dst_pv = (pv_spec_t *)dst; + pv_value_t dst_val; json_t* json = NULL; json_error_t parsing_error; - json = json_loads(src_s.s, JSON_REJECT_DUPLICATES, &parsing_error); + json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); if(!json) { - ERR("failed to parse: %.*s\n", src_s.len, src_s.s); + ERR("failed to parse: %.*s\n", src_s->len, src_s->s); ERR("json error at line %d: %s\n", parsing_error.line, parsing_error.text); goto fail; } - char* path = path_s.s; + char* path = path_s->s; json_t* v = json_path_get(json, path); if(!v) { @@ -87,6 +72,24 @@ int janssonmod_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) return -1; } +int janssonmod_get(struct sip_msg* msg, char* path_in, char* src_in, char* dst) +{ + str src_s; + str path_s; + + if (fixup_get_svalue(msg, (gparam_p)src_in, &src_s) != 0) { + ERR("cannot get json string value\n"); + return -1; + } + + if (fixup_get_svalue(msg, (gparam_p)path_in, &path_s) != 0) { + ERR("cannot get path string value\n"); + return -1; + } + + return janssonmod_get_helper(msg, &path_s, &src_s, (pv_spec_t *)dst); +} + #define STR_EQ_STATIC(a,b) ((a.len == sizeof(b)-1) && (strncmp(a.s, b, sizeof(b)-1)==0)) int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, diff --git a/src/modules/jansson/jansson_funcs.h b/src/modules/jansson/jansson_funcs.h index 9373956520..abf3e15ba3 100644 --- a/src/modules/jansson/jansson_funcs.h +++ b/src/modules/jansson/jansson_funcs.h @@ -31,5 +31,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, char* path_in, char* value_in, char* result); int janssonmod_array_size(struct sip_msg* msg, char* json_in, char* path_in, char* dst); +int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, + pv_spec_t *dst_pv); #endif diff --git a/src/modules/jansson/jansson_mod.c b/src/modules/jansson/jansson_mod.c index a8404a241f..50c3d91292 100644 --- a/src/modules/jansson/jansson_mod.c +++ b/src/modules/jansson/jansson_mod.c @@ -25,6 +25,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "../../core/kemi.h" #include "jansson_funcs.h" #include "jansson_utils.h" @@ -147,3 +148,46 @@ static int fixup_set_params_free(void** param, int param_no) static int mod_init(void) { return 0; } + +/** + * + */ +static int ki_jansson_get(sip_msg_t *msg, str *spath, str *sdoc, str *spv) +{ + pv_spec_t *pvs = NULL; + + pvs = pv_cache_get(spv); + if(pvs==NULL) { + LM_ERR("cannot get pv spec for [%.*s]\n", spv->len, spv->s); + return -1; + } + + if(pvs->setf==NULL) { + LM_ERR("read only output var [%.*s]\n", spv->len, spv->s); + return -1; + } + + return janssonmod_get_helper(msg, spath, sdoc, pvs); +} + +/** + * + */ +static sr_kemi_t sr_kemi_jansson_exports[] = { + { str_init("jansson"), str_init("get"), + SR_KEMIP_INT, ki_jansson_get, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} +}; + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_jansson_exports); + return 0; +} \ No newline at end of file

1 0

git:master:8f5b70ca: misc/examples/ims/pcscf/route: Update the rest of the routing scripts for P-CSCF with IPSec support; Fix Rx_AAR() calls.
by Tsvetomir Dimitrov 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: 8f5b70ca81e1d49c926a6174191ffe8d7097e3cc URL: https://github.com/kamailio/kamailio/commit/8f5b70ca81e1d49c926a6174191ffe8… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-08-22T16:03:24+03:00 misc/examples/ims/pcscf/route: Update the rest of the routing scripts for P-CSCF with IPSec support; Fix Rx_AAR() calls. --- Modified: misc/examples/ims/pcscf/route/mo.cfg Modified: misc/examples/ims/pcscf/route/mt.cfg Modified: misc/examples/ims/pcscf/route/register.cfg --- Diff: https://github.com/kamailio/kamailio/commit/8f5b70ca81e1d49c926a6174191ffe8… Patch: https://github.com/kamailio/kamailio/commit/8f5b70ca81e1d49c926a6174191ffe8… --- diff --git a/misc/examples/ims/pcscf/route/mo.cfg b/misc/examples/ims/pcscf/route/mo.cfg index f00aad61fc..235b9f1275 100644 --- a/misc/examples/ims/pcscf/route/mo.cfg +++ b/misc/examples/ims/pcscf/route/mo.cfg @@ -95,6 +95,7 @@ onreply_route[MO_reply] { remove_hf("C-Params"); append_hf("Contact: $ct;$hdr(C-Params)\r\n"); } + ipsec_forward("location"); # In case of 1xx and 2xx do NAT if(status=~"[12][0-9][0-9]") route(NATMANAGE); @@ -112,7 +113,7 @@ onreply_route[MO_reply] { $avp(TTAG_CUSTOM_AVP)=$tt; $avp(CALLID_CUSTOM_AVP)=$ci; - $var(aarret) = Rx_AAR("MO_aar_reply","orig"); + $var(aarret) = Rx_AAR("MO_aar_reply","orig","",-1); xlog("L_DBG", "AAR return code is $var(aarret)\n"); switch ($var(aarret)) { @@ -135,6 +136,7 @@ onreply_route[MO_reply] { } } +} route[MO_aar_reply] { @@ -184,7 +186,7 @@ onreply_route[MO_indialog_reply] { $avp(TTAG_CUSTOM_AVP)=$tt; $avp(CALLID_CUSTOM_AVP)=$ci; - $var(aarret) = Rx_AAR("MO_indialog_aar_reply","orig"); + $var(aarret) = Rx_AAR("MO_indialog_aar_reply","orig","",-1); xlog("L_DBG", "AAR return code is $var(aarret)\n"); switch ($var(aarret)) { diff --git a/misc/examples/ims/pcscf/route/mt.cfg b/misc/examples/ims/pcscf/route/mt.cfg index 3ee9d66c52..eab2c7c37e 100644 --- a/misc/examples/ims/pcscf/route/mt.cfg +++ b/misc/examples/ims/pcscf/route/mt.cfg @@ -30,7 +30,7 @@ onreply_route[MT_reply] { $avp(TTAG_CUSTOM_AVP)=$tt; $avp(CALLID_CUSTOM_AVP)=$ci; - $var(aarret) = Rx_AAR("MT_aar_reply","term"); + $var(aarret) = Rx_AAR("MT_aar_reply","term","",-1); xlog("L_DBG", "AAR return code is $var(aarret)\n"); switch ($var(aarret)) { @@ -104,7 +104,7 @@ onreply_route[MT_indialog_reply] { $avp(TTAG_CUSTOM_AVP)=$tt; $avp(CALLID_CUSTOM_AVP)=$ci; - $var(aarret) = Rx_AAR("MT_indialog_aar_reply","term"); + $var(aarret) = Rx_AAR("MT_indialog_aar_reply","term","",-1); xlog("L_DBG", "AAR return code is $var(aarret)\n"); switch ($var(aarret)) { diff --git a/misc/examples/ims/pcscf/route/register.cfg b/misc/examples/ims/pcscf/route/register.cfg index df7ddcd1cd..b2d1f92638 100644 --- a/misc/examples/ims/pcscf/route/register.cfg +++ b/misc/examples/ims/pcscf/route/register.cfg @@ -156,7 +156,13 @@ onreply_route[REGISTER_reply] xlog("L_DBG", "REGISTER SUCCESS[$ci] took $var(stat_add)ms\n"); update_stat("register_success", "+1"); update_stat("register_time", "$var(stat_add)"); + ipsec_forward("location"); } + else { + if (t_check_status("401")) { + ipsec_create("location"); + } + } exit; }

1 0

git:master:c4daee86: misc/examples/ims/pcscf: Add support for IPSec in the P-CSCF examples
by Tsvetomir Dimitrov 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: c4daee863519b1795c605e3896506e5ec7e26a41 URL: https://github.com/kamailio/kamailio/commit/c4daee863519b1795c605e3896506e5… Author: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Committer: Tsvetomir Dimitrov <tsv.dimitrov(a)gmail.com> Date: 2018-08-22T15:28:11+03:00 misc/examples/ims/pcscf: Add support for IPSec in the P-CSCF examples --- Modified: misc/examples/ims/pcscf/kamailio.cfg Modified: misc/examples/ims/pcscf/pcscf.cfg.sample --- Diff: https://github.com/kamailio/kamailio/commit/c4daee863519b1795c605e3896506e5… Patch: https://github.com/kamailio/kamailio/commit/c4daee863519b1795c605e3896506e5… --- diff --git a/misc/examples/ims/pcscf/kamailio.cfg b/misc/examples/ims/pcscf/kamailio.cfg index 8502ce6dc0..0c3f65de77 100644 --- a/misc/examples/ims/pcscf/kamailio.cfg +++ b/misc/examples/ims/pcscf/kamailio.cfg @@ -162,6 +162,9 @@ loadmodule "statistics" loadmodule "ims_dialog" loadmodule "ims_usrloc_pcscf" loadmodule "ims_registrar_pcscf" +#!ifdef WITH_IPSEC +loadmodule "ims_ipsec_pcscf" +#!endif #!ifdef WITH_XMLRPC loadmodule "xmlrpc" @@ -366,6 +369,12 @@ modparam("ims_registrar_pcscf", "subscribe_to_reginfo", 0) modparam("ims_registrar_pcscf", "publish_reginfo", 0) #!endif +#!ifdef WITH_IPSEC +modparam("ims_ipsec_pcscf", "ipsec_listen_addr", IPSEC_LISTEN_ADDR) +modparam("ims_ipsec_pcscf", "ipsec_client_port", IPSEC_CLIENT_PORT) +modparam("ims_ipsec_pcscf", "ipsec_server_port", IPSEC_SERVER_PORT) +#!endif + #!ifdef WITH_RX # -- CDP params -- modparam("cdp","config_file","/etc/kamailio_pcscf/pcscf.xml") @@ -700,7 +709,11 @@ route[REQINIT] { send_reply("503", "Server shutting down"); exit; } - + + if (!is_method("REGISTER")) { + ipsec_forward("location"); + } + # Ignore Re-Transmits: if (t_lookup_request()) { exit; @@ -852,6 +865,7 @@ event_route[uac:reply] { } xlog(" Unregistering $uac_req(ruri);$var(alias)\n"); setdebug("9"); + ipsec_destroy("location"); pcscf_unregister("location", "$uac_req(ruri);$var(alias)", "$(uac_req(ouri){uri.host})", "$(uac_req(ouri){uri.port})"); resetdebug(); $sht(natping=>$uac_req(ouri)) = $null; diff --git a/misc/examples/ims/pcscf/pcscf.cfg.sample b/misc/examples/ims/pcscf/pcscf.cfg.sample index 5a89ee1020..6b7a7231ca 100644 --- a/misc/examples/ims/pcscf/pcscf.cfg.sample +++ b/misc/examples/ims/pcscf/pcscf.cfg.sample @@ -7,6 +7,11 @@ listen=udp:11.22.33.44:5060 # SIP / TCP/TLS #listen=tls:11.22.33.44:5061 +# IPSEC / UDP +#!define IPSEC_LISTEN_ADDR "11.22.33.44" +#!define IPSEC_CLIENT_PORT 5062 +#!define IPSEC_SERVER_PORT 5063 + alias=pcscf.mnc001.mcc001.3gppnetwork.org #!define MY_WS_PORT 80 @@ -104,4 +109,4 @@ alias=pcscf.mnc001.mcc001.3gppnetwork.org ##!define WITH_REGINFO ##!define WITH_RTPPING ##!define WITH_WEBSOCKET - +##!define WITH_IPSEC

1 0

Kamailio v5.1.5 Released
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Hello, Kamailio SIP Server v5.1.5 stable release is out. This is a maintenance release of the latest stable branch, 5.1, that includes fixes since the release of v5.1.4. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.5. For more details about version 5.1.5 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/08/kamailio-v5-1-5-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - www.kamailioworld.com

1 0

git:master:f6921b92: sdpops: cast in dbg message to avoid compile warning on 32b systems
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: f6921b92d382db3c0a72bd1d97eb46d1f4aee2d7 URL: https://github.com/kamailio/kamailio/commit/f6921b92d382db3c0a72bd1d97eb46d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T12:03:52+02:00 sdpops: cast in dbg message to avoid compile warning on 32b systems --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f6921b92d382db3c0a72bd1d97eb46d… Patch: https://github.com/kamailio/kamailio/commit/f6921b92d382db3c0a72bd1d97eb46d… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index b47f824e33..b317c0ac9b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -512,8 +512,9 @@ int sdp_remove_line_by_prefix(sip_msg_t* msg, str* prefix, str* media) LM_DBG("range for media type %.*s: %ld - %ld\n", sdp_stream->media.len, sdp_stream->media.s, - sdp_stream->raw_stream.s - body.s, - sdp_stream->raw_stream.s + sdp_stream->raw_stream.len - body.s + (long int)(sdp_stream->raw_stream.s - body.s), + (long int)(sdp_stream->raw_stream.s + + sdp_stream->raw_stream.len - body.s) ); found += sdp_remove_line_lump_by_prefix(msg,&(sdp_stream->raw_stream),prefix);

1 0

git:5.1:d060804b: ChangeLog: content updated for v5.1.5
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: d060804b66b0f7eb064810b1445d4d076e246423 URL: https://github.com/kamailio/kamailio/commit/d060804b66b0f7eb064810b1445d4d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T11:33:14+02:00 ChangeLog: content updated for v5.1.5 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/d060804b66b0f7eb064810b1445d4d0… Patch: https://github.com/kamailio/kamailio/commit/d060804b66b0f7eb064810b1445d4d0…

1 0

[kamailio/kamailio] Issues with PUA_REGINFO module (#1579)
by Lars Olsson 22 Aug '18

22 Aug '18

### Description While testing to implement an IMS AS, I used the PUA_REGINFO module to receive details about the SIP registration. PUA_REGINFO module uses PUA and USRLOC modules. However, a couple of issues was found including a crash: 1) Crash when processing SIP Notify with registration terminated info. 2) Randomly fails storing data to USRLOC, (entries already exists) 3) Saves corrupt data to database use_domain is set in usrloc but domain not provided in Notify request ### Troubleshooting I am pretty new to Kamailio, but my findings are the following in notify.c 1) PUA_REGINFO modules, deletes the record with "ul.delete_urecord(...)" and later down in the code calls "if (ul_record) ul.release_urecord(ul_record);". Crashes on the release_urecord call. My assumption without knowing to much about userloc is that release can not be called on a deleted record. Hence it should be enough to set ul_record = NULL after calling "ul.delete_urecord(...)" to not call release_urecord later on. 2) It looks like there is an issue handling parallell request. Without knowing too much, it replacing sruid_next(..) with sruid_next_safe() resolves the issue. Also, the static variable of type ucontact_info_t should probably become local as well. 3) Maybe incorrect to set use_domain to 1 when using the module, however I think it should be failsafe and not store garbage data in to database. Not looked into this issue. #### Reproduction Send Notify request with REGINFO body for registration and unregistration and forward it to the module according to the documentation of PUA_REGINFO. #### Debugging Data Attaching SIPp scenario. Changing code according to 1) and 2) make the SIPp script runs and no critical issues seen. (Have too less experience to ensure that no memleaks are introduced or still present in the module code) <?xml version="1.0" encoding="ISO-8859-1" ?> <scenario name="notify"> <send retrans="500"> <![CDATA[ NOTIFY sip:[remote_ip] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: <sip:[field0]@[field1]>;tag=[call_number] To: <sip:[field0]@[field1]> Call-ID: [call_id] CSeq: 1 NOTIFY Contact: sip:[field0]@[local_ip]:[local_port] Max-Forwards: 70 Expires: 1800 Event: reg User-Agent: SIPp/Linux Subscription-State: active;expires=6888 Content-Type: application/reginfo+xml Content-Length: [len] <?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="2" state="full"> <registration aor="sip:[field0]@mnc001.mcc001.3gppnetwork.org" id="0x7feff71118f8" state="active"> <contact id="0x7feff7126e58" state="active" event="registered" expires="595" q="0.500"> <uri>sip:[field0]@192.168.55.103:21061;ob;alias=192.168.55.103~21061~1</uri> <unknown-param name="+g.3gpp.smsip"></unknown-param> <unknown-param name="q">"0.5"</unknown-param> </contact> </registration> </reginfo> ]]> </send> <recv response="202" rtd="true"> </recv> <pause milliseconds="1000"/> <send retrans="500"> <![CDATA[ NOTIFY sip:[remote_ip] SIP/2.0 Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch] From: <sip:[field0]@[field1]>;tag=[call_number] To: <sip:[field0]@[field1]> Call-ID: [call_id] CSeq: 2 NOTIFY Contact: sip:[field0]@[local_ip]:[local_port] Max-Forwards: 70 Expires: 1800 User-Agent: SIPp/Linux Event: reg Subscription-State: active;expires=6888 Content-Type: application/reginfo+xml Content-Length: [len] <?xml version="1.0"?> <reginfo xmlns="urn:ietf:params:xml:ns:reginfo" version="3" state="full"> <registration aor="sip:[field0]@mnc001.mcc001.3gppnetwork.org" id="0x7feff71118f8" state="terminated"> <contact id="0x1" state="terminated" event="expired" expires="0" q="0.000"> <uri>sip:[field0]@192.168.55.103:21061;ob;alias=192.168.55.103~21061~1</uri> </contact> </registration> </reginfo> ]]> </send> <recv response="202" rtd="true"> </recv> </scenario> #### Log Messages #### SIP Traffic ### Possible Solutions See troubleshooting. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` 5.1.4 ``` * **Operating System**: ``` Debian 8.11 ``` -- 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/1579

6 15

git:5.1:4ba66923: Makefile.defs: version set to 5.1.5
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: 4ba6692343efa1e0a56daae9bfbc20ff645a3e59 URL: https://github.com/kamailio/kamailio/commit/4ba6692343efa1e0a56daae9bfbc20f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T11:11:38+02:00 Makefile.defs: version set to 5.1.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/4ba6692343efa1e0a56daae9bfbc20f… Patch: https://github.com/kamailio/kamailio/commit/4ba6692343efa1e0a56daae9bfbc20f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 9b809b8bfa..6cf372786d 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:2aed2291: pkg: version set to 5.1.5 in spec files
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: 2aed22913a00ae5a10015a2b1c129c4163fed7cd URL: https://github.com/kamailio/kamailio/commit/2aed22913a00ae5a10015a2b1c129c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T11:08:50+02:00 pkg: version set to 5.1.5 in spec files --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/2aed22913a00ae5a10015a2b1c129c4… Patch: https://github.com/kamailio/kamailio/commit/2aed22913a00ae5a10015a2b1c129c4… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index b71a44de05..d00772f20b 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.4 +pkgver=5.1.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 3b938428b9..ee8cb66640 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index b9313c520b..774b8e4962 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d28af186b4..ba6512632a 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index 8177b7d92a..22c56b0298 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 9f9c2ef023..3b9f8e471d 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index df70f8a0aa..d4315799e9 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index 745ca62e00..e0fdf6fe20 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index ee3a58c647..3eb759dc29 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.4 +%define ver 5.1.5 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

git:5.1:2f713104: dmq: release resources instead of just doing continue to next job
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: 2f713104e6ad0b59e2dbfb0a4062af770e742de5 URL: https://github.com/kamailio/kamailio/commit/2f713104e6ad0b59e2dbfb0a4062af7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T11:03:04+02:00 dmq: release resources instead of just doing continue to next job - for cases when processing of the job is not fully completed (cherry picked from commit a1f5fbe2c18246d4afefa44fd8a52612a5182a46) --- Modified: src/modules/dmq/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/2f713104e6ad0b59e2dbfb0a4062af7… Patch: https://github.com/kamailio/kamailio/commit/2f713104e6ad0b59e2dbfb0a4062af7… --- diff --git a/src/modules/dmq/worker.c b/src/modules/dmq/worker.c index 9c7873560c..14aadfc998 100644 --- a/src/modules/dmq/worker.c +++ b/src/modules/dmq/worker.c @@ -114,7 +114,7 @@ void worker_loop(int id) current_job->msg, &peer_response, dmq_node); if(ret_value < 0) { LM_ERR("running job failed\n"); - continue; + goto nextjob; } /* add the body to the reply */ if(peer_response.body.s) { @@ -122,7 +122,7 @@ void worker_loop(int id) &peer_response.content_type) < 0) { LM_ERR("error adding lumps\n"); - continue; + goto nextjob; } } /* send the reply */ @@ -130,8 +130,12 @@ void worker_loop(int id) &peer_response.reason) < 0) { LM_ERR("error sending reply\n"); + } else { + LM_DBG("done sending reply\n"); } + worker->jobs_processed++; +nextjob: /* if body given, free the lumps and free the body */ if(peer_response.body.s) { del_nonshm_lump_rpl(&current_job->msg->reply_lump); @@ -141,10 +145,8 @@ void worker_loop(int id) free_to(current_job->msg->from->parsed); } - LM_DBG("sent reply\n"); shm_free(current_job->msg); shm_free(current_job); - worker->jobs_processed++; } } }

1 0

git:5.1:2c91b11a: pua_reginfo: fix crash and issue during high load
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: 2c91b11abbe835ca3319ba3517d9fd726f078937 URL: https://github.com/kamailio/kamailio/commit/2c91b11abbe835ca3319ba3517d9fd7… Author: lasseo <lars.olsson76(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-22T11:01:14+02:00 pua_reginfo: fix crash and issue during high load - do not release a already deleted entry, as this causes a crash - use sruid_next_safe instead of sruid_next as it has been seen during load that same sruid returned on multiple threads (cherry picked from commit 62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594) --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/2c91b11abbe835ca3319ba3517d9fd7… Patch: https://github.com/kamailio/kamailio/commit/2c91b11abbe835ca3319ba3517d9fd7… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 754a2ed099..ea50f2db65 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -111,7 +111,7 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal ci.expires = time(0) + expires; /* set ruid */ - if(sruid_next(&_reginfo_sruid) < 0) { + if(sruid_next_safe(&_reginfo_sruid) < 0) { LM_ERR("failed to generate ruid"); } else { ci.ruid = _reginfo_sruid.uid; @@ -306,9 +306,15 @@ int process_body(str notify_body, udomain_t * domain) { } ul_contact = ul_contact->next; } + if (ul.delete_urecord(domain, &aor_key, ul_record) < 0) { LM_ERR("failed to remove record from usrloc\n"); - } + } + + /* Record deleted, and should not be used anymore */ + ul_record = NULL; + + /* If already a registration with contacts was found, then keep that result. otherwise the result is now "No contacts found" */ if (final_result != RESULT_CONTACTS_FOUND) final_result = RESULT_NO_CONTACTS;

1 0

git:master:9c793758: Merge pull request #1623 from lasseo/pua_reginfo_crashfix
by GitHub 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: 9c79375861575bafbda5e39a6e1b178eda05f610 URL: https://github.com/kamailio/kamailio/commit/9c79375861575bafbda5e39a6e1b178… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-22T11:00:05+02:00 Merge pull request #1623 from lasseo/pua_reginfo_crashfix pua_reginfo: fix crash and issue during load --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/9c79375861575bafbda5e39a6e1b178… Patch: https://github.com/kamailio/kamailio/commit/9c79375861575bafbda5e39a6e1b178… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 754a2ed099..ea50f2db65 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -111,7 +111,7 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal ci.expires = time(0) + expires; /* set ruid */ - if(sruid_next(&_reginfo_sruid) < 0) { + if(sruid_next_safe(&_reginfo_sruid) < 0) { LM_ERR("failed to generate ruid"); } else { ci.ruid = _reginfo_sruid.uid; @@ -306,9 +306,15 @@ int process_body(str notify_body, udomain_t * domain) { } ul_contact = ul_contact->next; } + if (ul.delete_urecord(domain, &aor_key, ul_record) < 0) { LM_ERR("failed to remove record from usrloc\n"); - } + } + + /* Record deleted, and should not be used anymore */ + ul_record = NULL; + + /* If already a registration with contacts was found, then keep that result. otherwise the result is now "No contacts found" */ if (final_result != RESULT_CONTACTS_FOUND) final_result = RESULT_NO_CONTACTS;

1 0

git:master:62e0af09: pua_reginfo: fix crash and issue during high load
by lasseo 22 Aug '18

22 Aug '18

Module: kamailio Branch: master Commit: 62e0af0957a6c7e3c2ea9711cf64ad51f4b2e594 URL: https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad5… Author: lasseo <lars.olsson76(a)gmail.com> Committer: lasseo <lars.olsson76(a)gmail.com> Date: 2018-08-21T22:10:04Z pua_reginfo: fix crash and issue during high load - do not release a already deleted entry, as this causes a crash - use sruid_next_safe instead of sruid_next as it has been seen during load that same sruid returned on multiple threads --- Modified: src/modules/pua_reginfo/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad5… Patch: https://github.com/kamailio/kamailio/commit/62e0af0957a6c7e3c2ea9711cf64ad5… --- diff --git a/src/modules/pua_reginfo/notify.c b/src/modules/pua_reginfo/notify.c index 754a2ed099..ea50f2db65 100644 --- a/src/modules/pua_reginfo/notify.c +++ b/src/modules/pua_reginfo/notify.c @@ -111,7 +111,7 @@ int process_contact(udomain_t * domain, urecord_t ** ul_record, str aor, str cal ci.expires = time(0) + expires; /* set ruid */ - if(sruid_next(&_reginfo_sruid) < 0) { + if(sruid_next_safe(&_reginfo_sruid) < 0) { LM_ERR("failed to generate ruid"); } else { ci.ruid = _reginfo_sruid.uid; @@ -306,9 +306,15 @@ int process_body(str notify_body, udomain_t * domain) { } ul_contact = ul_contact->next; } + if (ul.delete_urecord(domain, &aor_key, ul_record) < 0) { LM_ERR("failed to remove record from usrloc\n"); - } + } + + /* Record deleted, and should not be used anymore */ + ul_record = NULL; + + /* If already a registration with contacts was found, then keep that result. otherwise the result is now "No contacts found" */ if (final_result != RESULT_CONTACTS_FOUND) final_result = RESULT_NO_CONTACTS;

1 0

[kamailio/kamailio] pua_reginfo: fix crash and issue during load (#1623)
by Lars Olsson 22 Aug '18

22 Aug '18

#### 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:  - [ x] PR should be backported to stable branches - [x ] Tested changes locally - [ x] Related to issue #1579 (replace XXXX with an open issue number) #### Description Fixes in pua_reginfo module that prevents module from crashing up on a register and unregister event. Use secure sruid generator to avoid duplicated sruids. Discussed in issue #1579 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1623 -- Commit Summary -- * pua_reginfo: fix crash and issue during high load -- File Changes -- M src/modules/pua_reginfo/notify.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1623.patch https://github.com/kamailio/kamailio/pull/1623.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/1623

2 2

git:5.1:233079b5: pkg/kamailio/deb: version set to 5.1.5
by Victor Seva 22 Aug '18

22 Aug '18

Module: kamailio Branch: 5.1 Commit: 233079b5174ba0c4e325e80ebb5f11504349b504 URL: https://github.com/kamailio/kamailio/commit/233079b5174ba0c4e325e80ebb5f115… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-08-22T10:06:48+02:00 pkg/kamailio/deb: version set to 5.1.5 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/233079b5174ba0c4e325e80ebb5f115… Patch: https://github.com/kamailio/kamailio/commit/233079b5174ba0c4e325e80ebb5f115… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index b078c9f9a7..19b4806e61 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.5) unstable; urgency=medium + + * version set to 5.1.5 + + -- Victor Seva <vseva(a)debian.org> Wed, 22 Aug 2018 10:05:51 +0200 + kamailio (5.1.4) unstable; urgency=medium * version set to 5.1.4

1 0

Releasing Kamailio v5.1.5
by Daniel-Constantin Mierla 22 Aug '18

22 Aug '18

Hello, with the summer holidays in the northern hemisphere approaching the end, I am considering to release v5.1.5 out of Kamailio git branch 5.1 -- there were several fixes done since 5.1.4 and it is time to package another minor release. The propose date is next week on Wednesday, August 22, or slightly after in case there are unexpected events delays it. Should there be any issues you are aware of and not yet reported on the bug tracker, do it asap in order to have a chance to be fixed: - https://github.com/kamailio/kamailio/issues Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio World Conference -- www.kamailioworld.com

1 2

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,bionic,slave #1169
by jenkins＠sipwise.com 22 Aug '18

22 Aug '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 1.26 MB...] dpkg-deb: building package 'kamailio-rabbitmq-modules' in '../kamailio-rabbitmq-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-cnxcc-modules' in '../kamailio-cnxcc-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-erlang-modules' in '../kamailio-erlang-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-systemd-modules' in '../kamailio-systemd-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-phonenum-modules' in '../kamailio-phonenum-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-mongodb-modules' in '../kamailio-mongodb-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-extra-modules' in '../kamailio-extra-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-nth' in '../kamailio-nth_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-dbg' in '../kamailio-dbg_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-geoip-modules' in '../kamailio-geoip-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-geoip2-modules' in '../kamailio-geoip2-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-sqlite-modules' in '../kamailio-sqlite-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-json-modules' in '../kamailio-json-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-memcached-modules' in '../kamailio-memcached-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-lua-modules' in '../kamailio-lua-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-mono-modules' in '../kamailio-mono-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-python-modules' in '../kamailio-python-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-redis-modules' in '../kamailio-redis-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-mysql-modules' in '../kamailio-mysql-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-postgres-modules' in '../kamailio-postgres-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-cpl-modules' in '../kamailio-cpl-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-radius-modules' in '../kamailio-radius-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-unixodbc-modules' in '../kamailio-unixodbc-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-presence-modules' in '../kamailio-presence-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-perl-modules' in '../kamailio-perl-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-snmpstats-modules' in '../kamailio-snmpstats-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. dpkg-deb: building package 'kamailio-xmpp-modules' in '../kamailio-xmpp-modules_5.2.0~dev6+0~20180821011152.1184+bionic_i386.deb'. make[1]: Leaving directory '/tmp/buildd/kamailio-5.2.0~dev6+0~20180821011152.1184+bionic' dpkg-genbuildinfo --build=any dpkg-genchanges --build=any >../kamailio_5.2.0~dev6+0~20180821011152.1184+bionic_i386.changes dpkg-genchanges: info: binary-only arch-specific upload (source code and arch-indep packages not included) dpkg-source --after-build kamailio-5.2.0~dev6+0~20180821011152.1184+bionic dpkg-buildpackage: info: binary-only upload (no source included) I: user script /var/cache/pbuilder/build/cow.15941/tmp/hooks/B20autopkgtest starting + cd /tmp/buildd/kamailio-5.2.0~dev6+0~20180821011152.1184+bionic/debian/.. + [ ! -f debian/tests/control ] + echo Package does not have autopkgtest support, debian/tests/control is missing Package does not have autopkgtest support, debian/tests/control is missing + exit 0 I: user script /var/cache/pbuilder/build/cow.15941/tmp/hooks/B20autopkgtest finished I: Copying back the cached apt archive contents I: unmounting /tmp/apt-jdg_Kmczs9 filesystem I: unmounting dev/pts filesystem I: unmounting run/shm filesystem I: unmounting proc filesystem E: BUILDRESULT=[<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…]> is not a directory. I: Current time: Tue Aug 21 04:44:41 UTC 2018 I: pbuilder-time-stamp: 1534826681 -> Cleaning COW directory forking: rm -rf /var/cache/pbuilder/build//cow.15941 + '[' 0 -eq 0 ']' + rm -f /var/run/lock/bionic-i386.building.8734 + '[' -n true ']' + echo '*** Config variable '\''BUILD_ONLY'\'' is set, ignoring request to use local repository. ***' *** Config variable 'BUILD_ONLY' is set, ignoring request to use local repository. *** + binaries_to_workspace + echo '*** Moving binaries files to workspace. ***' *** Moving binaries files to workspace. *** + mv '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> mv: cannot stat ‘<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>: No such file or directory + rmdir <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> rmdir: failed to remove ‘<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>: No such file or directory + autopkg_run + case "${ADT:-}" in + echo '*** Skipping external autopkgtests as ADT is neither set to '\''external'\'' nor '\''all'\'' ***' *** Skipping external autopkgtests as ADT is neither set to 'external' nor 'all' *** + return 0 + autopkgtest_results + '[' -n '' ']' + mkdir -p adt mkdir: cannot create directory ‘adt’: No such file or directory + '[' -r autopkgtest.summary ']' + touch adt/summary touch: cannot touch ‘adt/summary’: No such file or directory + '[' -n /home/admin/kamailio-deb-jenkins/scripts/jdg-debc ']' + echo '*** Found environment variable POST_BUILD_HOOK, set to /home/admin/kamailio-deb-jenkins/scripts/jdg-debc ***' *** Found environment variable POST_BUILD_HOOK, set to /home/admin/kamailio-deb-jenkins/scripts/jdg-debc *** + sh /home/admin/kamailio-deb-jenkins/scripts/jdg-debc sh: 0: getcwd() failed: No such file or directory ┌──────────────────────────────────────────────────────────────────────────────┐ │ Displaying content of generated Debian packages. │ └──────────────────────────────────────────────────────────────────────────────┘ No changes and deb files found in , ignoring. + bailout 0 + '[' -n 0 ']' + EXIT=0 + '[' -n '' ']' + rm -f /var/run/lock/bionic-i386.building.8734 + '[' -r /var/run/lock/bionic-i386.update.8734 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.MzAS1Tm8ht ']' + rm -rf /tmp/tmp.MzAS1Tm8ht + '[' -n /tmp/apt-jdg_Kmczs9 ']' + sudo rm -rf /tmp/apt-jdg_Kmczs9 + '[' -n 12737 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=810 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Tue Aug 21 04:44:43 UTC 2018 [running 810 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Tue Aug 21 04:44:43 UTC 2018 [running 810 seconds] *** + exit 0 [slave] $ /bin/sh -xe /tmp/jenkins1457502802034705748.sh FATAL: command execution failed Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-02da097e243b07a0a) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.Launcher$RemoteLauncher.launch(Launcher.java:1052) at hudson.Launcher$ProcStarter.start(Launcher.java:449) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:109) at hudson.tasks.CommandInterpreter.perform(CommandInterpreter.java:66) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.Build$BuildExecution.build(Build.java:206) at hudson.model.Build$BuildExecution.doRun(Build.java:163) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:504) at hudson.model.Run.execute(Run.java:1798) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: Process working directory '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> doesn't exist! at hudson.Proc$LocalProc.<init>(Proc.java:247) at hudson.Proc$LocalProc.<init>(Proc.java:218) at hudson.Launcher$LocalLauncher.launch(Launcher.java:929) at hudson.Launcher$ProcStarter.start(Launcher.java:449) at hudson.Launcher$RemoteLaunchCallable.call(Launcher.java:1299) at hudson.Launcher$RemoteLaunchCallable.call(Launcher.java:1259) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Execute shell' marked build as failure Archiving artifacts ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-02da097e243b07a0a) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:233) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.ArtifactArchiver$ListFiles.invoke(ArtifactArchiver.java:288) at hudson.tasks.ArtifactArchiver$ListFiles.invoke(ArtifactArchiver.java:268) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Archive the artifacts' marked build as failure TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-02da097e243b07a0a) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-02da097e243b07a0a) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 1

git:5.1:c916f470: htable: test if there is a db table associated with htable for rpc reload
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: 5.1 Commit: c916f4701ffae4500b5fcc8fe6e255953ee8780a URL: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:33+02:00 htable: test if there is a db table associated with htable for rpc reload (cherry picked from commit 79c16cd9bdabb3670b2a7618656ca9cf2f9687b1) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… Patch: https://github.com/kamailio/kamailio/commit/c916f4701ffae4500b5fcc8fe6e2559… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index e667e0bd39..fbe016e0aa 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1156,7 +1156,12 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - + if(ht->dbtable.s==NULL || ht->dbtable.len<=0) + { + ht_db_close_con(); + rpc->fault(c, 500, "No database htable"); + return; + } memcpy(&nht, ht, sizeof(ht_t)); /* it's temporary operation - use system malloc */

1 0

git:5.1:b11ff57c: mtree: rpc reload without table name reloads all tables
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: 5.1 Commit: b11ff57c7bc2925003f86f925f6cff41cae4212f URL: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:13+02:00 mtree: rpc reload without table name reloads all tables - lost feature in rpc which was available in mi command (cherry picked from commit c216abc532df9f22b023d26b46bd6322a217cdfe) --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… Patch: https://github.com/kamailio/kamailio/commit/b11ff57c7bc2925003f86f925f6cff4… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 4ce2786afb..0710186869 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -930,7 +930,8 @@ static const char* rpc_mtree_summary_doc[2] = { void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; - m_tree_t *pt; + m_tree_t *pt = NULL; + int treloaded = 0; if(db_table.len>0) { @@ -949,8 +950,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) /* read tree name */ if (rpc->scan(c, "S", &tname) != 1) { - rpc->fault(c, 500, "Failed to get table name parameter"); - return; + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { + tname.s = 0; + tname.len = 0; + } } pt = mt_get_first_tree(); @@ -967,9 +973,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) LM_ERR("cannot re-load mtree from database\n"); goto error; } + treloaded = 1; } pt = pt->next; } + if(treloaded == 0) { + rpc->fault(c, 500, "No Mtree Name Matching"); + } } return;

1 0

git:5.1:3532ffc7: htable: typo in rpc result status text for reload command
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: 5.1 Commit: 3532ffc752eaa92c696bb8853cb5b0738a18dcea URL: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:23+02:00 htable: typo in rpc result status text for reload command (cherry picked from commit ff90e2223825889c2eea108d2fc02190535960fc) --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… Patch: https://github.com/kamailio/kamailio/commit/3532ffc752eaa92c696bb8853cb5b07… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3d7cc3e93f..e667e0bd39 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1164,7 +1164,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(nht.entries == NULL) { ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "No resources for htable reload"); return; } memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); @@ -1184,7 +1184,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "Htable reload failed"); return; }

1 0

git:5.1:bc47ac83: http_client: Makefile - removed useless var for xml config
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: 5.1 Commit: bc47ac839aed45ecdce414c2a21d36112abace76 URL: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T17:43:03+02:00 http_client: Makefile - removed useless var for xml config (cherry picked from commit ebb1377e9f07f00afccdce50b113d05fec1693b5) --- Modified: src/modules/http_client/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… Patch: https://github.com/kamailio/kamailio/commit/bc47ac839aed45ecdce414c2a21d361… --- diff --git a/src/modules/http_client/Makefile b/src/modules/http_client/Makefile index 460e146bae..be06cab978 100644 --- a/src/modules/http_client/Makefile +++ b/src/modules/http_client/Makefile @@ -9,7 +9,6 @@ auto_gen= NAME=http_client.so ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) CURL_BUILDER=$(shell \ if pkg-config --exists libcurl; then \ echo 'pkg-config libcurl'; \

1 0

[kamailio/kamailio] Append_to_reply does not work for XHTTP responses (#1548)
by Olle E. Johansson 21 Aug '18

21 Aug '18

Tried append_to_reply from textutils in event_route[xhttp:request] - which is not a documented usage. It did not generate an error about a bad route, but did not seem to append the header to the response. This may be a feature request, but wouldn't it be cool if it worked? -- 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/1548

2 10

git:master:0bd3c9ea: kamctl: added mtree management command
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: master Commit: 0bd3c9eaf356d65b9620fb7ec8c6ebc1e0a47782 URL: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T12:06:20+02:00 kamctl: added mtree management command --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… Patch: https://github.com/kamailio/kamailio/commit/0bd3c9eaf356d65b9620fb7ec8c6ebc… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 954eee37ae..acc0d1f741 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1362,6 +1362,64 @@ permissions_address() { } +# +##### ------------------------------------------------ ##### +### mtree management +# +mtree_management() { + case $1 in + reload) + require_ctlengine + ctl_cmd_run mtree.reload $2 + ;; + dump) + require_ctlengine + ctl_cmd_run mtree.list $2 + ;; + showdb) + require_dbengine + QUERY="select * FROM $2 ; " + $DBROCMD "$QUERY" + ;; + add) + require_dbengine + if [ $# -lt 4 ] ; then + usage_mtree + exit 1 + fi + + QUERY="INSERT INTO $2 \ + (tprefix, tvalue) \ + VALUES ($3, '$4');" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "mtree - SQL Error" + exit 1 + fi + minfo "execute '$0 mtree reload' to synchronize cache and database" + ;; + rm) + require_dbengine + shift + if [ $# -ne 3 ] ; then + usage_address + exit 1 + fi + QUERY="DELETE FROM $2 where tprefix='$3';" + $DBCMD "$QUERY" + if [ $? -ne 0 ] ; then + merr "mtree - SQL Error" + exit 1 + fi + minfo "execute '$0 mtree reload' to synchronize cache and database" + ;; + *) + usage_mtree + exit 1 + esac +} + + # ##### ------------------------------------------------ ##### ### LCR management @@ -2876,6 +2934,11 @@ case $1 in permissions_address "$@" ;; + mtree) + shift + mtree_management "$@" + ;; + rpc) require_ctlengine shift diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 641449422c..adeceb77fb 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -552,6 +552,22 @@ EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv" +usage_mtree() { + echo + mecho " -- command 'add|dump|reload|rm|show' - manage mtree" + echo +cat <<EOF + mtree show <tname> .................. show db content + mtree dump [<tname>] ................ show cache content + mtree reload [<tname>] .............. reload db table into cache + mtree add <tname> <tprefix> <tvalue> + ......................... add a new entry + mtree rm <tname> <tprefix> .......... remove entries for given tname and tprefix +EOF +} +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_mtree" + + ##### ----------------------------------------------- ##### #### Common functions

1 0

git:master:79c16cd9: htable: test if there is a db table associated with htable for rpc reload
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: master Commit: 79c16cd9bdabb3670b2a7618656ca9cf2f9687b1 URL: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T09:05:34+02:00 htable: test if there is a db table associated with htable for rpc reload --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… Patch: https://github.com/kamailio/kamailio/commit/79c16cd9bdabb3670b2a7618656ca9c… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index e667e0bd39..fbe016e0aa 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1156,7 +1156,12 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) rpc->fault(c, 500, "No such htable"); return; } - + if(ht->dbtable.s==NULL || ht->dbtable.len<=0) + { + ht_db_close_con(); + rpc->fault(c, 500, "No database htable"); + return; + } memcpy(&nht, ht, sizeof(ht_t)); /* it's temporary operation - use system malloc */

1 0

git:master:ff90e222: htable: typo in rpc result status text for reload command
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: master Commit: ff90e2223825889c2eea108d2fc02190535960fc URL: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:47:01+02:00 htable: typo in rpc result status text for reload command --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… Patch: https://github.com/kamailio/kamailio/commit/ff90e2223825889c2eea108d2fc0219… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 3d7cc3e93f..e667e0bd39 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1164,7 +1164,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if(nht.entries == NULL) { ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "No resources for htable reload"); return; } memset(nht.entries, 0, nht.htsize*sizeof(ht_entry_t)); @@ -1184,7 +1184,7 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) } free(nht.entries); ht_db_close_con(); - rpc->fault(c, 500, "Mtree reload failed"); + rpc->fault(c, 500, "Htable reload failed"); return; }

1 0

git:master:8a1c5b01: utils/kamctl: removed the option of executing mi commands
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: master Commit: 8a1c5b01f7c82571e3763ac4caff71b1d318e732 URL: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:39:54+02:00 utils/kamctl: removed the option of executing mi commands --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b… Patch: https://github.com/kamailio/kamailio/commit/8a1c5b01f7c82571e3763ac4caff71b…

1 0

git:master:c216abc5: mtree: rpc reload without table name reloads all tables
by Daniel-Constantin Mierla 21 Aug '18

21 Aug '18

Module: kamailio Branch: master Commit: c216abc532df9f22b023d26b46bd6322a217cdfe URL: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-21T08:30:00+02:00 mtree: rpc reload without table name reloads all tables - lost feature in rpc which was available in mi command --- Modified: src/modules/mtree/mtree_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… Patch: https://github.com/kamailio/kamailio/commit/c216abc532df9f22b023d26b46bd632… --- diff --git a/src/modules/mtree/mtree_mod.c b/src/modules/mtree/mtree_mod.c index 4ce2786afb..0710186869 100644 --- a/src/modules/mtree/mtree_mod.c +++ b/src/modules/mtree/mtree_mod.c @@ -930,7 +930,8 @@ static const char* rpc_mtree_summary_doc[2] = { void rpc_mtree_reload(rpc_t* rpc, void* c) { str tname = {0, 0}; - m_tree_t *pt; + m_tree_t *pt = NULL; + int treloaded = 0; if(db_table.len>0) { @@ -949,8 +950,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) /* read tree name */ if (rpc->scan(c, "S", &tname) != 1) { - rpc->fault(c, 500, "Failed to get table name parameter"); - return; + tname.s = 0; + tname.len = 0; + } else { + if(*tname.s=='.') { + tname.s = 0; + tname.len = 0; + } } pt = mt_get_first_tree(); @@ -967,9 +973,13 @@ void rpc_mtree_reload(rpc_t* rpc, void* c) LM_ERR("cannot re-load mtree from database\n"); goto error; } + treloaded = 1; } pt = pt->next; } + if(treloaded == 0) { + rpc->fault(c, 500, "No Mtree Name Matching"); + } } return;

1 0

Build failed in Jenkins: kamailio51-nightly-binaries » amd64,buster,slave #84
by jenkins＠sipwise.com 20 Aug '18

20 Aug '18

See <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> ------------------------------------------ [...truncated 596.71 KB...] CC (gcc) [kamailio] core/str.o CC (gcc) [kamailio] core/ut.o CC (gcc) [kamailio] core/forward.o CC (gcc) [kamailio] core/pvapi.o CC (gcc) [kamailio] core/dst_blacklist.o CC (gcc) [kamailio] core/bit_count.o CC (gcc) [kamailio] core/atomic_ops.o CC (gcc) [kamailio] core/data_lump.o CC (gcc) [kamailio] core/raw_listener.o CC (gcc) [kamailio] core/action.o CC (gcc) [kamailio] core/dns_cache.o CC (gcc) [kamailio] core/timer.o CC (gcc) [kamailio] core/endianness.o CC (gcc) [kamailio] core/switch.o CC (gcc) [kamailio] core/select_core.o core/select_core.c: In function 'select_uri_hostport': core/select_core.c:854:4: warning: 'strncpy' output truncated before terminating nul copying 5 bytes from a string of the same length [-Wstringop-truncation] strncpy(p+select_uri_p->host.len, ":5061", 5); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ core/select_core.c:859:4: warning: 'strncpy' output truncated before terminating nul copying 5 bytes from a string of the same length [-Wstringop-truncation] strncpy(p+select_uri_p->host.len, ":5060", 5); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CC (gcc) [kamailio] core/resolve.o CC (gcc) [kamailio] core/daemonize.o CC (gcc) [kamailio] core/kemi.o CC (gcc) [kamailio] core/fmsg.o CC (gcc) [kamailio] core/mod_fix.o CC (gcc) [kamailio] core/sr_compat.o CC (gcc) [kamailio] core/crc.o CC (gcc) [kamailio] core/data_lump_rpl.o CC (gcc) [kamailio] core/error.o CC (gcc) [kamailio] core/stun.o CC (gcc) [kamailio] core/md5.o CC (gcc) [kamailio] core/flags.o CC (gcc) [kamailio] core/srapi.o CC (gcc) [kamailio] core/lvalue.o CC (gcc) [kamailio] core/sip_msg_clone.o CC (gcc) [kamailio] core/ip_addr.o CC (gcc) [kamailio] core/tcp_read.o CC (gcc) [kamailio] core/dprint.o CC (gcc) [kamailio] core/pt.o CC (gcc) [kamailio] core/tcp_options.o CC (gcc) [kamailio] core/nonsip_hooks.o CC (gcc) [kamailio] core/pv_core.o CC (gcc) [kamailio] core/id.o CC (gcc) [kamailio] core/mem/shm_mem.o CC (gcc) [kamailio] core/mem/pkg.o CC (gcc) [kamailio] core/mem/sf_malloc.o CC (gcc) [kamailio] core/mem/q_malloc.o CC (gcc) [kamailio] core/mem/shm.o CC (gcc) [kamailio] core/mem/ll_malloc.o CC (gcc) [kamailio] core/mem/mem.o CC (gcc) [kamailio] core/mem/tlsf_malloc.o CC (gcc) [kamailio] core/mem/f_malloc.o CC (gcc) [kamailio] core/mem/dl_malloc.o CC (gcc) [kamailio] core/mem/memtest.o CC (gcc) [kamailio] core/parser/parse_from.o CC (gcc) [kamailio] core/parser/parse_param.o CC (gcc) [kamailio] core/parser/parser_f.o CC (gcc) [kamailio] core/parser/parse_subscription_state.o CC (gcc) [kamailio] core/parser/parse_retry_after.o CC (gcc) [kamailio] core/parser/parse_addr_spec.o CC (gcc) [kamailio] core/parser/parse_rr.o CC (gcc) [kamailio] core/parser/parse_allow.o CC (gcc) [kamailio] core/parser/parse_diversion.o CC (gcc) [kamailio] core/parser/parse_cseq.o CC (gcc) [kamailio] core/parser/parse_content.o CC (gcc) [kamailio] core/parser/parse_event.o CC (gcc) [kamailio] core/parser/parse_uri.o CC (gcc) [kamailio] core/parser/parse_disposition.o CC (gcc) [kamailio] core/parser/parse_methods.o CC (gcc) [kamailio] core/parser/parse_sipifmatch.o CC (gcc) [kamailio] core/parser/parse_nameaddr.o CC (gcc) [kamailio] core/parser/parse_body.o CC (gcc) [kamailio] core/parser/hf.o CC (gcc) [kamailio] core/parser/parse_via.o CC (gcc) [kamailio] core/parser/parse_hname2.o CC (gcc) [kamailio] core/parser/parse_supported.o CC (gcc) [kamailio] core/parser/parse_rpid.o CC (gcc) [kamailio] core/parser/parse_privacy.o CC (gcc) [kamailio] core/parser/parse_identity.o CC (gcc) [kamailio] core/parser/parse_option_tags.o CC (gcc) [kamailio] core/parser/parse_fline.o CC (gcc) [kamailio] core/parser/parse_hostport.o CC (gcc) [kamailio] core/parser/parse_date.o CC (gcc) [kamailio] core/parser/parse_require.o CC (gcc) [kamailio] core/parser/parse_to.o CC (gcc) [kamailio] core/parser/parse_ppi_pai.o CC (gcc) [kamailio] core/parser/parse_identityinfo.o CC (gcc) [kamailio] core/parser/parse_refer_to.o CC (gcc) [kamailio] core/parser/parse_expires.o CC (gcc) [kamailio] core/parser/msg_parser.o CC (gcc) [kamailio] core/parser/digest/param_parser.o CC (gcc) [kamailio] core/parser/digest/digest_parser.o CC (gcc) [kamailio] core/parser/digest/digest.o CC (gcc) [kamailio] core/parser/contact/contact.o CC (gcc) [kamailio] core/parser/contact/parse_contact.o CC (gcc) [kamailio] core/parser/sdp/sdp.o CC (gcc) [kamailio] core/parser/sdp/sdp_helpr_funcs.o CC (gcc) [kamailio] core/rand/fastrand.o CC (gcc) [kamailio] core/rand/isaac/rand.o CC (gcc) [kamailio] core/cfg/cfg_select.o CC (gcc) [kamailio] core/cfg/cfg_ctx.o CC (gcc) [kamailio] core/cfg/cfg_struct.o CC (gcc) [kamailio] core/cfg/cfg_script.o CC (gcc) [kamailio] core/cfg/cfg.o bison -d -b core/cfg core/cfg.y flex -o core/lex.yy.c core/cfg.lex Build step 'Execute shell' marked build as failure Archiving artifacts ERROR: Step ‘Archive the artifacts’ aborted due to exception: java.nio.file.NoSuchFileException: <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> at sun.nio.fs.UnixException.translateToIOException(UnixException.java:86) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:218) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:131) at sun.nio.fs.UnixFileSystemProvider.readAttributes(UnixFileSystemProvider.java:144) at sun.nio.fs.LinuxFileSystemProvider.readAttributes(LinuxFileSystemProvider.java:99) at java.nio.file.Files.readAttributes(Files.java:1737) at java.nio.file.Files.getPosixFilePermissions(Files.java:2004) at hudson.util.IOUtils.mode(IOUtils.java:130) Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel$2.adapt(Channel.java:990) at hudson.remoting.Channel$2.adapt(Channel.java:986) at hudson.remoting.FutureAdapter.get(FutureAdapter.java:55) at hudson.FilePath.copyRecursiveTo(FilePath.java:2375) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused: hudson.os.PosixException: Unable to get file permissions null at hudson.util.IOUtils.mode(IOUtils.java:133) at hudson.util.io.TarArchiver.visit(TarArchiver.java:92) at hudson.util.DirScanner.scanSingle(DirScanner.java:44) at hudson.FilePath$ExplicitlySpecifiedDirScanner.scan(FilePath.java:2995) at hudson.FilePath.writeToTar(FilePath.java:2432) at hudson.FilePath.access$2800(FilePath.java:210) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2397) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2386) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused: java.io.IOException at hudson.FilePath.copyRecursiveTo(FilePath.java:2379) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 1

git:master:ebb1377e: http_client: Makefile - removed useless var for xml config
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: ebb1377e9f07f00afccdce50b113d05fec1693b5 URL: https://github.com/kamailio/kamailio/commit/ebb1377e9f07f00afccdce50b113d05… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T16:18:38+02:00 http_client: Makefile - removed useless var for xml config --- Modified: src/modules/http_client/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/ebb1377e9f07f00afccdce50b113d05… Patch: https://github.com/kamailio/kamailio/commit/ebb1377e9f07f00afccdce50b113d05… --- diff --git a/src/modules/http_client/Makefile b/src/modules/http_client/Makefile index 460e146bae..be06cab978 100644 --- a/src/modules/http_client/Makefile +++ b/src/modules/http_client/Makefile @@ -9,7 +9,6 @@ auto_gen= NAME=http_client.so ifeq ($(CROSS_COMPILE),) -XML2CFG=$(shell which xml2-config) CURL_BUILDER=$(shell \ if pkg-config --exists libcurl; then \ echo 'pkg-config libcurl'; \

1 0

Build failed in Jenkins: kamailio51-nightly-binaries » amd64,stretch,slave #84
by jenkins＠sipwise.com 20 Aug '18

20 Aug '18

See <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> ------------------------------------------ [...truncated 642.63 KB...] CC (gcc) [M presence.so] presentity.o CC (gcc) [M presence.so] hash.o CC (gcc) [M presence.so] event_list.o CC (gcc) [M presence.so] notify.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M presence.so] presence.so CC (gcc) [M presence_conference.so] notify_body.o CC (gcc) [M presence_conference.so] pidf.o CC (gcc) [M presence_conference.so] presence_conference.o CC (gcc) [M presence_conference.so] add_events.o LD (gcc) [M presence_conference.so] presence_conference.so CC (gcc) [M presence_dialoginfo.so] notify_body.o CC (gcc) [M presence_dialoginfo.so] presence_dialoginfo.o CC (gcc) [M presence_dialoginfo.so] pidf.o CC (gcc) [M presence_dialoginfo.so] add_events.o LD (gcc) [M presence_dialoginfo.so] presence_dialoginfo.so CC (gcc) [M presence_mwi.so] presence_mwi.o CC (gcc) [M presence_mwi.so] add_events.o LD (gcc) [M presence_mwi.so] presence_mwi.so CC (gcc) [M presence_profile.so] presence_profile.o CC (gcc) [M presence_profile.so] add_events.o LD (gcc) [M presence_profile.so] presence_profile.so CC (gcc) [M presence_reginfo.so] presence_reginfo.o CC (gcc) [M presence_reginfo.so] add_events.o LD (gcc) [M presence_reginfo.so] presence_reginfo.so CC (gcc) [M presence_xml.so] notify_body.o CC (gcc) [M presence_xml.so] xcap_auth.o CC (gcc) [M presence_xml.so] pidf.o CC (gcc) [M presence_xml.so] presence_xml.o CC (gcc) [M presence_xml.so] pres_check.o CC (gcc) [M presence_xml.so] add_events.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M presence_xml.so] presence_xml.so CC (gcc) [M pua.so] pua_db.o CC (gcc) [M pua.so] pua_callback.o CC (gcc) [M pua.so] pidf.o CC (gcc) [M pua.so] send_subscribe.o CC (gcc) [M pua.so] hash.o CC (gcc) [M pua.so] pua.o CC (gcc) [M pua.so] event_list.o CC (gcc) [M pua.so] pua_bind.o CC (gcc) [M pua.so] send_publish.o CC (gcc) [M pua.so] add_events.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M pua.so] pua.so CC (gcc) [M pua_bla.so] registrar_cb.o CC (gcc) [M pua_bla.so] pua_bla.o CC (gcc) [M pua_bla.so] notify.o LD (gcc) [M pua_bla.so] pua_bla.so CC (gcc) [M pua_dialoginfo.so] pua_dialoginfo.o CC (gcc) [M pua_dialoginfo.so] dialog_publish.o LD (gcc) [M pua_dialoginfo.so] pua_dialoginfo.so CC (gcc) [M pua_reginfo.so] pua_reginfo.o CC (gcc) [M pua_reginfo.so] subscribe.o CC (gcc) [M pua_reginfo.so] usrloc_cb.o CC (gcc) [M pua_reginfo.so] notify.o make[4]: 'libsrutils.so.1.0' is up to date. LD (gcc) [M pua_reginfo.so] pua_reginfo.so CC (gcc) [M pua_rpc.so] pua_rpc.o LD (gcc) [M pua_rpc.so] pua_rpc.so CC (gcc) [M pua_usrloc.so] ul_publish.o CC (gcc) [M pua_usrloc.so] pua_usrloc.o LD (gcc) [M pua_usrloc.so] pua_usrloc.so CC (gcc) [M pua_xmpp.so] request_winfo.o CC (gcc) [M pua_xmpp.so] xmpp2simple.o CC (gcc) [M pua_xmpp.so] pidf.o CC (gcc) [M pua_xmpp.so] simple2xmpp.o CC (gcc) [M pua_xmpp.so] pua_xmpp.o LD (gcc) [M pua_xmpp.so] pua_xmpp.so CC (gcc) [M rls.so] subscribe.o CC (gcc) [M rls.so] rls.o CC (gcc) [M rls.so] utils.o CC (gcc) [M rls.so] rls_db.o CC (gcc) [M rls.so] resource_notify.o CC (gcc) [M rls.so] notify.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M rls.so] rls.so CC (gcc) [M xcap_client.so] xcap_callbacks.o CC (gcc) [M xcap_client.so] xcap_functions.o CC (gcc) [M xcap_client.so] xcap_client.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_client.so] xcap_client.so CC (gcc) [M xcap_server.so] xcap_server.o CC (gcc) [M xcap_server.so] xcap_misc.o make[4]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M xcap_server.so] xcap_server.so make[2]: Leaving directory '/tmp/buildd/kamailio-5.1.4+0~20180818022305.85+stretch/src' make[1]: Leaving directory '/tmp/buildd/kamailio-5.1.4+0~20180818022305.85+stretch' /usr/bin/make every-module group_include="kldap" make[1]: Entering directory '/tmp/buildd/kamailio-5.1.4+0~20180818022305.85+stretch' /usr/bin/make -C src/ every-module make[2]: Entering directory '/tmp/buildd/kamailio-5.1.4+0~20180818022305.85+stretch/src' CC (gcc) [M db2_ldap.so] ld_res.o CC (gcc) [M db2_ldap.so] ld_cfg.o CC (gcc) [M db2_ldap.so] ld_uri.o CC (gcc) [M db2_ldap.so] db2_ldap_mod.o CC (gcc) [M db2_ldap.so] ld_cmd.o CC (gcc) [M db2_ldap.so] ld_fld.o CC (gcc) [M db2_ldap.so] ld_con.o make[4]: 'libsrdb2.so.1.0' is up to date. LD (gcc) [M db2_ldap.so] db2_ldap.so CC (gcc) [M h350.so] h350_exp_fn.o CC (gcc) [M h350.so] h350_mod.o LD (gcc) [M h350.so] h350.so CC (gcc) [M ldap.so] ldap_exp_fn.o CC (gcc) [M ldap.so] ldap_connect.o CC (gcc) [M ldap.so] ldap_mod.o CC (gcc) [M ldap.so] ld_session.o Build step 'Execute shell' marked build as failure Archiving artifacts ERROR: Step ‘Archive the artifacts’ aborted due to exception: java.nio.file.NoSuchFileException: <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> at sun.nio.fs.UnixException.translateToIOException(UnixException.java:86) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:218) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:131) at sun.nio.fs.UnixFileSystemProvider.readAttributes(UnixFileSystemProvider.java:144) at sun.nio.fs.LinuxFileSystemProvider.readAttributes(LinuxFileSystemProvider.java:99) at java.nio.file.Files.readAttributes(Files.java:1737) at java.nio.file.Files.getPosixFilePermissions(Files.java:2004) at hudson.util.IOUtils.mode(IOUtils.java:130) Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel$2.adapt(Channel.java:990) at hudson.remoting.Channel$2.adapt(Channel.java:986) at hudson.remoting.FutureAdapter.get(FutureAdapter.java:55) at hudson.FilePath.copyRecursiveTo(FilePath.java:2375) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused: hudson.os.PosixException: Unable to get file permissions null at hudson.util.IOUtils.mode(IOUtils.java:133) at hudson.util.io.TarArchiver.visit(TarArchiver.java:92) at hudson.util.DirScanner.scanSingle(DirScanner.java:44) at hudson.FilePath$ExplicitlySpecifiedDirScanner.scan(FilePath.java:2995) at hudson.FilePath.writeToTar(FilePath.java:2432) at hudson.FilePath.access$2800(FilePath.java:210) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2397) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2386) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused: java.io.IOException at hudson.FilePath.copyRecursiveTo(FilePath.java:2379) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailio51-nightly-binaries/architecture=a…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 1

git:master:d006e7ac: modules: readme files regenerated - app_lua ... [skip ci]
by Kamailio Dev 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: d006e7ac00c4bd7079decf829568bd20973d7742 URL: https://github.com/kamailio/kamailio/commit/d006e7ac00c4bd7079decf829568bd2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-20T15:01:38+02:00 modules: readme files regenerated - app_lua ... [skip ci] --- Modified: src/modules/app_lua/README --- Diff: https://github.com/kamailio/kamailio/commit/d006e7ac00c4bd7079decf829568bd2… Patch: https://github.com/kamailio/kamailio/commit/d006e7ac00c4bd7079decf829568bd2… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index 4e908f10f5..d631c1d4d1 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -28,6 +28,7 @@ Daniel-Constantin Mierla 3.1. load (string) 3.2. register (string) 3.3. reload (boolean) + 3.4. log_mode (int) 4. Functions @@ -50,10 +51,11 @@ Daniel-Constantin Mierla 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 + 1.5. Set log_mode parameter + 1.6. lua_dofile usage + 1.7. lua_dostring usage + 1.8. lua_run usage + 1.9. lua_runstring usage Chapter 1. Admin Guide @@ -70,6 +72,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. register (string) 3.3. reload (boolean) + 3.4. log_mode (int) 4. Functions @@ -138,6 +141,7 @@ Chapter 1. Admin Guide 3.1. load (string) 3.2. register (string) 3.3. reload (boolean) + 3.4. log_mode (int) 3.1. load (string) @@ -209,6 +213,18 @@ modparam("app_lua", "register", "sl") modparam("app_lua", "reload", 0) ... +3.4. log_mode (int) + + Control what is printed in log messages. If bit 1 is set, then the + module prints debug messages for each KEMI export. + + Default value is “0”. + + Example 1.5. Set log_mode parameter +... +modparam("app_lua", "log_mode", 1) +... + 4. Functions 4.1. lua_dofile(path) @@ -221,7 +237,7 @@ modparam("app_lua", "reload", 0) Execute the Lua script stored in 'path'. The parameter can be a string with pseudo-variables evaluated at runtime. - Example 1.5. lua_dofile usage + Example 1.6. lua_dofile usage ... lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); ... @@ -231,7 +247,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.6. lua_dostring usage + Example 1.7. lua_dostring usage ... if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) { @@ -247,7 +263,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.7. lua_run usage + Example 1.8. lua_run usage ... if(!lua_run("sr_append_fu_to_reply")) { xdbg("SCRIPT: failed to execute lua function!\n"); @@ -265,7 +281,7 @@ lua_run("lua_func3", "$rU", "2", "$si"); string with pseudo-variables. The script is executed in Lua context specific to loaded Lua files at startup. - Example 1.8. lua_runstring usage + Example 1.9. lua_runstring usage ... if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) {

1 0

git:master:2d0baf4d: app_lua: docs for log_mode parameter
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 2d0baf4d1c23f251030ef1924cbb7a324c6406f4 URL: https://github.com/kamailio/kamailio/commit/2d0baf4d1c23f251030ef1924cbb7a3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T14:49:45+02:00 app_lua: docs for log_mode parameter --- Modified: src/modules/app_lua/doc/app_lua_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2d0baf4d1c23f251030ef1924cbb7a3… Patch: https://github.com/kamailio/kamailio/commit/2d0baf4d1c23f251030ef1924cbb7a3… --- diff --git a/src/modules/app_lua/doc/app_lua_admin.xml b/src/modules/app_lua/doc/app_lua_admin.xml index ab8601bcc0..294c52ac72 100644 --- a/src/modules/app_lua/doc/app_lua_admin.xml +++ b/src/modules/app_lua/doc/app_lua_admin.xml @@ -289,6 +289,27 @@ modparam("app_lua", "reload", 0) </example> </section> + <section id="app_lua.p.log_mode"> + <title><varname>log_mode</varname> (int)</title> + <para> + Control what is printed in log messages. If bit 1 is set, then + the module prints debug messages for each KEMI export. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>log_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("app_lua", "log_mode", 1) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:92421ec9: app_lua: new module parameter - log_mode
by Daniel-Constantin Mierla 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 92421ec9e377d5422b686554dca738e3a0492435 URL: https://github.com/kamailio/kamailio/commit/92421ec9e377d5422b686554dca738e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-08-20T14:47:48+02:00 app_lua: new module parameter - log_mode - control what is printed in log messages by module - if bit 1 is set, the it prints the KEMI exports --- Modified: src/modules/app_lua/app_lua_mod.c Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/92421ec9e377d5422b686554dca738e… Patch: https://github.com/kamailio/kamailio/commit/92421ec9e377d5422b686554dca738e… --- diff --git a/src/modules/app_lua/app_lua_mod.c b/src/modules/app_lua/app_lua_mod.c index 362a9bc6b6..8450610140 100644 --- a/src/modules/app_lua/app_lua_mod.c +++ b/src/modules/app_lua/app_lua_mod.c @@ -65,10 +65,13 @@ int app_lua_load_param(modparam_t type, void *val); int app_lua_register_param(modparam_t type, void *val); int app_lua_reload_param(modparam_t type, void *val); +int _ksr_app_lua_log_mode = 0; + static param_export_t params[]={ {"load", PARAM_STRING|USE_FUNC_PARAM, (void*)app_lua_load_param}, {"register", PARAM_STRING|USE_FUNC_PARAM, (void*)app_lua_register_param}, {"reload", INT_PARAM|USE_FUNC_PARAM, (void*)app_lua_reload_param}, + {"log_mode", PARAM_INT, &_ksr_app_lua_log_mode}, {0, 0, 0} }; diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index a72e657279..4414bd83a2 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -44,6 +44,10 @@ #include "app_lua_kemi_export.h" #include "app_lua_sr.h" +#define KSR_APP_LUA_LOG_EXPORTS (1<<0) + +extern int _ksr_app_lua_log_mode; + /** * */ @@ -2029,7 +2033,9 @@ void lua_sr_kemi_register_libs(lua_State *L) } for(i=0; emods[0].kexp[i].func!=NULL; i++) { - LM_DBG("exporting KSR.%s(...)\n", emods[0].kexp[i].fname.s); + if(_ksr_app_lua_log_mode & KSR_APP_LUA_LOG_EXPORTS) { + LM_DBG("exporting KSR.%s(...)\n", emods[0].kexp[i].fname.s); + } _sr_crt_KSRMethods[i].name = emods[0].kexp[i].fname.s; _sr_crt_KSRMethods[i].func = sr_kemi_lua_export_associate(&emods[0].kexp[i]); @@ -2055,8 +2061,10 @@ void lua_sr_kemi_register_libs(lua_State *L) _sr_crt_KSRMethods = _sr_KSRMethods + n; snprintf(mname, 128, "KSR.%s", emods[k].kexp[0].mname.s); for(i=0; emods[k].kexp[i].func!=NULL; i++) { - LM_DBG("exporting %s.%s(...)\n", mname, - emods[k].kexp[i].fname.s); + if(_ksr_app_lua_log_mode & KSR_APP_LUA_LOG_EXPORTS) { + LM_DBG("exporting %s.%s(...)\n", mname, + emods[k].kexp[i].fname.s); + } _sr_crt_KSRMethods[i].name = emods[k].kexp[i].fname.s; _sr_crt_KSRMethods[i].func = sr_kemi_lua_export_associate(&emods[k].kexp[i]); @@ -2073,8 +2081,10 @@ void lua_sr_kemi_register_libs(lua_State *L) exit(-1); } luaL_openlib(L, mname, _sr_crt_KSRMethods, 0); - LM_DBG("initializing kemi sub-module: %s (%s) (%d/%d/%d)\n", mname, - emods[k].kexp[0].mname.s, i, k, n); + if(_ksr_app_lua_log_mode & KSR_APP_LUA_LOG_EXPORTS) { + LM_DBG("initializing kemi sub-module: %s (%s) (%d/%d/%d)\n", + mname, emods[k].kexp[0].mname.s, i, k, n); + } } } LM_DBG("module 'KSR' has been initialized (%d/%d)\n", emods_size, n);

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,buster,slave #1166
by jenkins＠sipwise.com 20 Aug '18

20 Aug '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 703.85 KB...] ../ims_usrloc_pcscf/../../core/dprint.h:339:2: note: in expansion of macro 'LOG__' LOG__(facility, level, NULL, prefix, fmt, ## args) ^~~~~ ../ims_usrloc_pcscf/../../core/dprint.h:343:2: note: in expansion of macro 'LOG_' LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ ^~~~ ../ims_usrloc_pcscf/../../core/dprint.h:394:31: note: in expansion of macro 'LOG' # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) ^~~ ../ims_usrloc_pcscf/../../core/dprint.h:420:16: note: in expansion of macro 'ERR' #define LM_ERR ERR ^~~ sem.h:67:4: note: in expansion of macro 'LM_ERR' LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ^~~~~~ cdpeventprocessor.c:85:3: note: in expansion of macro 'sem_new' sem_new(cdp_event_list->empty, 0); //pre-locked - as we assume list is empty at start ^~~~~~~ In file included from cdpeventprocessor.c:47: sem.h:67:31: note: format string is defined here LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ~~^ %x In file included from ../ims_usrloc_pcscf/../../core/ut.h:42, from ../ims_usrloc_pcscf/../../core/ip_addr.h:39, from ../ims_usrloc_pcscf/../../core/globals.h:35, from ../ims_usrloc_pcscf/../../core/pt.h:30, from ../ims_usrloc_pcscf/../../core/counters.h:37, from ../ims_usrloc_pcscf/usrloc.h:49, from cdpeventprocessor.c:48: ../ims_usrloc_pcscf/../../core/dprint.h:308:24: warning: format '%lx' expects argument of type 'long unsigned int', but argument 8 has type 'unsigned int' [-Wformat=] fprintf(stderr, "%2d(%d) %s: %s" fmt, \ ^~~~~~~~~~~~~~~~ ../ims_usrloc_pcscf/../../core/dprint.h:339:2: note: in expansion of macro 'LOG__' LOG__(facility, level, NULL, prefix, fmt, ## args) ^~~~~ ../ims_usrloc_pcscf/../../core/dprint.h:343:2: note: in expansion of macro 'LOG_' LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ ^~~~ ../ims_usrloc_pcscf/../../core/dprint.h:394:31: note: in expansion of macro 'LOG' # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) ^~~ ../ims_usrloc_pcscf/../../core/dprint.h:420:16: note: in expansion of macro 'ERR' #define LM_ERR ERR ^~~ sem.h:67:4: note: in expansion of macro 'LM_ERR' LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ^~~~~~ cdpeventprocessor.c:85:3: note: in expansion of macro 'sem_new' sem_new(cdp_event_list->empty, 0); //pre-locked - as we assume list is empty at start ^~~~~~~ In file included from cdpeventprocessor.c:47: sem.h:67:31: note: format string is defined here LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ~~^ %x CC (gcc) [M ims_qos.so] rx_str.o CC (gcc) [M ims_qos.so] rx_avp.o CC (gcc) [M ims_qos.so] rx_authdata.o CC (gcc) [M ims_qos.so] ims_qos_stats.o CC (gcc) [M ims_qos.so] stats.o make[4]: 'libkamailio_ims.so.0.1' is up to date. LD (gcc) [M ims_qos.so] ims_qos.so CC (gcc) [M ims_registrar_pcscf.so] ims_registrar_pcscf_mod.o CC (gcc) [M ims_registrar_pcscf.so] subscribe.o CC (gcc) [M ims_registrar_pcscf.so] service_routes.o CC (gcc) [M ims_registrar_pcscf.so] save.o CC (gcc) [M ims_registrar_pcscf.so] sec_agree.o CC (gcc) [M ims_registrar_pcscf.so] ul_callback.o Process leaked file descriptors. See https://jenkins.io/redirect/troubleshooting/process-leaked-file-descriptors for more information Build step 'Execute shell' marked build as failure CC (gcc) [M ims_registrar_pcscf.so] async_reginfo.o In file included from ../../core/mem/mem.h:41, from ../../core/lock_alloc.h:54, from ../../core/locking.h:71, from async_reginfo.h:49, from async_reginfo.c:47: async_reginfo.c: In function 'init_reginfo_event_list': ../../core/mem/../dprint.h:302:24: warning: format '%lx' expects argument of type 'long unsigned int', but argument 10 has type 'unsigned int' [-Wformat=] fprintf(stderr, "%2d(%d) %s: %.*s%s" fmt, \ ^~~~~~~~~~~~~~~~~~~~ ../../core/mem/../dprint.h:339:2: note: in expansion of macro 'LOG__' LOG__(facility, level, NULL, prefix, fmt, ## args) ^~~~~ ../../core/mem/../dprint.h:343:2: note: in expansion of macro 'LOG_' LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ ^~~~ ../../core/mem/../dprint.h:394:31: note: in expansion of macro 'LOG' # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) ^~~ ../../core/mem/../dprint.h:420:16: note: in expansion of macro 'ERR' #define LM_ERR ERR ^~~ sem.h:62:4: note: in expansion of macro 'LM_ERR' LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ^~~~~~ async_reginfo.c:76:2: note: in expansion of macro 'sem_new' sem_new(reginfo_event_list->empty, 0); //pre-locked - as we assume list is empty at start ^~~~~~~ In file included from async_reginfo.h:50, from async_reginfo.c:47: sem.h:62:31: note: format string is defined here LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ~~^ %x In file included from ../../core/mem/mem.h:41, from ../../core/lock_alloc.h:54, from ../../core/locking.h:71, from async_reginfo.h:49, from async_reginfo.c:47: ../../core/mem/../dprint.h:308:24: warning: format '%lx' expects argument of type 'long unsigned int', but argument 8 has type 'unsigned int' [-Wformat=] fprintf(stderr, "%2d(%d) %s: %s" fmt, \ ^~~~~~~~~~~~~~~~ ../../core/mem/../dprint.h:339:2: note: in expansion of macro 'LOG__' LOG__(facility, level, NULL, prefix, fmt, ## args) ^~~~~ ../../core/mem/../dprint.h:343:2: note: in expansion of macro 'LOG_' LOG_(DEFAULT_FACILITY, (level), LOC_INFO, "%s(): " fmt ,\ ^~~~ ../../core/mem/../dprint.h:394:31: note: in expansion of macro 'LOG' # define ERR(fmt, args...) LOG(L_ERR, fmt , ## args) ^~~ ../../core/mem/../dprint.h:420:16: note: in expansion of macro 'ERR' #define LM_ERR ERR ^~~ sem.h:62:4: note: in expansion of macro 'LM_ERR' LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ^~~~~~ async_reginfo.c:76:2: note: in expansion of macro 'sem_new' sem_new(reginfo_event_list->empty, 0); //pre-locked - as we assume list is empty at start ^~~~~~~ In file included from async_reginfo.h:50, from async_reginfo.c:47: sem.h:62:31: note: format string is defined here LM_ERR("Error allocating %lx bytes of shm!\n",sizeof(gen_sem_t));\ ~~^ %x CC (gcc) [M ims_registrar_pcscf.so] notify.o make[4]: 'libkamailio_ims.so.0.1' is up to date. Archiving artifacts ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:233) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.ArtifactArchiver$ListFiles.invoke(ArtifactArchiver.java:288) at hudson.tasks.ArtifactArchiver$ListFiles.invoke(ArtifactArchiver.java:268) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Archive the artifacts' marked build as failure TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 2

git:master:9811a92e: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 9811a92e6341d3da48946bbe6f1810cc4cfa6bae URL: https://github.com/kamailio/kamailio/commit/9811a92e6341d3da48946bbe6f1810c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-08-20T12:01:53+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/9811a92e6341d3da48946bbe6f1810c… Patch: https://github.com/kamailio/kamailio/commit/9811a92e6341d3da48946bbe6f1810c…

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » amd64,stretch,slave #1166
by jenkins＠sipwise.com 20 Aug '18

20 Aug '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 1.29 MB...] -rw-r--r-- root/root 83 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dialog_vars -rw-r--r-- root/root 128 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dialplan -rw-r--r-- root/root 104 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dispatcher -rw-r--r-- root/root 65 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/domain -rw-r--r-- root/root 82 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/domain_attrs -rw-r--r-- root/root 34 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/domain_name -rw-r--r-- root/root 94 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/domainpolicy -rw-r--r-- root/root 116 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dr_gateways -rw-r--r-- root/root 79 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dr_groups -rw-r--r-- root/root 49 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dr_gw_lists -rw-r--r-- root/root 130 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/dr_rules -rw-r--r-- root/root 69 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/globalblacklist -rw-r--r-- root/root 77 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/grp -rw-r--r-- root/root 92 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/htable -rw-r--r-- root/root 69 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/imc_members -rw-r--r-- root/root 52 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/imc_rooms -rw-r--r-- root/root 248 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/lcr_gw -rw-r--r-- root/root 142 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/lcr_rule -rw-r--r-- root/root 76 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/lcr_rule_target -rw-r--r-- root/root 365 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/location -rw-r--r-- root/root 123 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/location_attrs -rw-r--r-- root/root 33 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/matrix -rw-r--r-- root/root 122 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/missed_calls -rw-r--r-- root/root 119 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/mohqcalls -rw-r--r-- root/root 86 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/mohqueues -rw-r--r-- root/root 45 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/mtree -rw-r--r-- root/root 59 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/mtrees -rw-r--r-- root/root 60 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/pdt -rw-r--r-- root/root 59 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/pl_pipes -rw-r--r-- root/root 165 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/presentity -rw-r--r-- root/root 315 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/pua -rw-r--r-- root/root 87 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/purplemap -rw-r--r-- root/root 44 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/re_grp -rw-r--r-- root/root 155 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/rls_presentity -rw-r--r-- root/root 423 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/rls_watchers -rw-r--r-- root/root 74 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/rtpengine -rw-r--r-- root/root 83 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/rtpproxy -rw-r--r-- root/root 219 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/sca_subscriptions -rw-r--r-- root/root 205 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/silo -rw-r--r-- root/root 196 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/sip_trace -rw-r--r-- root/root 148 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/speed_dial -rw-r--r-- root/root 133 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/subscriber -rw-r--r-- root/root 386 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/topos_d -rw-r--r-- root/root 412 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/topos_t -rw-r--r-- root/root 126 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/trusted -rw-r--r-- root/root 234 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uacreg -rw-r--r-- root/root 127 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_credentials -rw-r--r-- root/root 52 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_domain -rw-r--r-- root/root 84 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_domain_attrs -rw-r--r-- root/root 67 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_global_attrs -rw-r--r-- root/root 81 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_uri -rw-r--r-- root/root 111 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_uri_attrs -rw-r--r-- root/root 79 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uid_user_attrs -rw-r--r-- root/root 82 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/uri -rw-r--r-- root/root 76 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/userblacklist -rw-r--r-- root/root 120 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/usr_preferences -rw-r--r-- root/root 902 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/version -rw-r--r-- root/root 150 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/watchers -rw-r--r-- root/root 123 2018-08-18 01:01 ./usr/share/kamailio/dbtext/kamailio/xcap drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/lintian/ drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/lintian/overrides/ -rw-r--r-- root/root 227 2018-03-28 00:56 ./usr/share/lintian/overrides/kamailio drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/man/ drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/man/man5/ -rw-r--r-- root/root 625 2018-08-18 01:01 ./usr/share/man/man5/kamailio.cfg.5.gz drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/man/man7/ drwxr-xr-x root/root 0 2018-08-18 01:01 ./usr/share/man/man8/ -rw-r--r-- root/root 1753 2018-08-18 01:01 ./usr/share/man/man8/kamailio.8.gz -rw-r--r-- root/root 395 2018-08-18 01:01 ./usr/share/man/man8/kamcmd.8.gz -rw-r--r-- root/root 536 2018-08-18 01:01 ./usr/share/man/man8/kamctl.8.gz -rw-r--r-- root/root 653 2018-08-18 01:01 ./usr/share/man/man8/kamdbctl.8.gz lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrdb1.so -> libsrdb1.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrdb1.so.1 -> libsrdb1.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrdb2.so -> libsrdb2.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrdb2.so.1 -> libsrdb2.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrutils.so -> libsrutils.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libsrutils.so.1 -> libsrutils.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libtrie.so -> libtrie.so.1.0 lrwxrwxrwx root/root 0 2018-08-18 01:01 ./usr/lib/x86_64-linux-gnu/kamailio/libtrie.so.1 -> libtrie.so.1.0 + bailout 0 + '[' -n 0 ']' + EXIT=0 + '[' -n '' ']' + rm -f /var/run/lock/stretch-amd64.building.24137 + '[' -r /var/run/lock/stretch-amd64.update.24137 ']' + '[' '' = true ']' + echo '*** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. ***' *** Getting rid of files in <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> to avoid problems in next run. *** + rm -f '<https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…'> + '[' -n /tmp/tmp.7LG4QZUl17 ']' + rm -rf /tmp/tmp.7LG4QZUl17 + '[' -n /tmp/apt-jdg_Y0gIBm ']' + sudo rm -rf /tmp/apt-jdg_Y0gIBm + '[' -n 6797 ']' ++ sed -e 's/^$[0-9]*$.*/\1/' + SECONDS=823 ++ date + echo '*** Finished execution of /usr/bin/build-and-provide-package at Sat Aug 18 04:29:14 UTC 2018 [running 823 seconds] ***' *** Finished execution of /usr/bin/build-and-provide-package at Sat Aug 18 04:29:14 UTC 2018 [running 823 seconds] *** + exit 0 [slave] $ /bin/sh -xe /tmp/jenkins4400670533572284647.sh + mkdir -p report + /usr/bin/lintian-junit-report kamailio_5.2.0~dev6+0~20180818005745.1181+stretch_source.changes kamailio_5.2.0~dev6+0~20180818010155.1181+stretch_amd64.changes <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist, exiting [slave] $ /bin/sh -xe /tmp/jenkins8450715373085822505.sh + mkdir -p report adt + touch adt/summary + /usr/bin/adtsummary_tap adt/summary Archiving artifacts ERROR: Step ‘Archive the artifacts’ aborted due to exception: java.nio.file.NoSuchFileException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> at sun.nio.fs.UnixException.translateToIOException(UnixException.java:86) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:218) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:131) at sun.nio.fs.UnixFileSystemProvider.readAttributes(UnixFileSystemProvider.java:144) at sun.nio.fs.LinuxFileSystemProvider.readAttributes(LinuxFileSystemProvider.java:99) at java.nio.file.Files.readAttributes(Files.java:1737) at java.nio.file.Files.getPosixFilePermissions(Files.java:2004) at hudson.util.IOUtils.mode(IOUtils.java:130) Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel$2.adapt(Channel.java:990) at hudson.remoting.Channel$2.adapt(Channel.java:986) at hudson.remoting.FutureAdapter.get(FutureAdapter.java:55) at hudson.FilePath.copyRecursiveTo(FilePath.java:2375) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused: hudson.os.PosixException: Unable to get file permissions null at hudson.util.IOUtils.mode(IOUtils.java:133) at hudson.util.io.TarArchiver.visit(TarArchiver.java:92) at hudson.util.DirScanner.scanSingle(DirScanner.java:44) at hudson.FilePath$ExplicitlySpecifiedDirScanner.scan(FilePath.java:2995) at hudson.FilePath.writeToTar(FilePath.java:2432) at hudson.FilePath.access$2800(FilePath.java:210) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2397) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2386) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused: java.io.IOException at hudson.FilePath.copyRecursiveTo(FilePath.java:2379) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-001c0fdf0e20b7135) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 2

git:master:2e1bbee4: registrar: docs for event_callback parameter
by Ivaylo Markov 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 2e1bbee47b69d4599b9a2fd1c80203e68f4537a0 URL: https://github.com/kamailio/kamailio/commit/2e1bbee47b69d4599b9a2fd1c80203e… Author: Ivaylo Markov <imarkov(a)zoiper.com> Committer: Ivaylo Markov <imarkov(a)zoiper.com> Date: 2018-08-18T18:01:36+03:00 registrar: docs for event_callback parameter --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e1bbee47b69d4599b9a2fd1c80203e… Patch: https://github.com/kamailio/kamailio/commit/2e1bbee47b69d4599b9a2fd1c80203e… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 70dbbcd97d..7c4226ad3c 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -961,6 +961,37 @@ modparam("registrar", "contact_max_size", 1024) </example> </section> + <section id="registrar.p.event_callback"> + <title><varname>event_callback</varname> (str)</title> + <para> + The name of the function in the KEMI configuration file (embedded + scripting language such as Lua, Python, ...) to be executed instead + of event_route[...] blocks. + </para> + <para> + The function receives a string parameter with the name of the event. + The only possible value currently is 'usrloc:contact-expired'. + </para> + <para> + <emphasis> + Default value is 'empty' (no function is executed for events). + </emphasis> + </para> + <example> + <title>Set <varname>event_callback</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("registrar", "event_callback", "ksr_registrar_event") +... +-- event callback function implemented in Lua +function ksr_registrar_event(evname) + KSR.info( "Expired contact for " .. KSR.pv.getw("$ulc(exp=>aor)") .. "\n"); + return 1; +end +... + </programlisting> + </example> + </section> </section>

1 0

git:master:9cc01c03: Merge pull request #1622 from lz1irq/master
by GitHub 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 9cc01c03e7c6a2ee110569aff5c78ef0f71e573c URL: https://github.com/kamailio/kamailio/commit/9cc01c03e7c6a2ee110569aff5c78ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-08-20T11:58:44+02:00 Merge pull request #1622 from lz1irq/master registrar: add event_callback parameter and relevant documentation --- Modified: src/modules/registrar/doc/registrar_admin.xml Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/9cc01c03e7c6a2ee110569aff5c78ef… Patch: https://github.com/kamailio/kamailio/commit/9cc01c03e7c6a2ee110569aff5c78ef…

1 0

[kamailio/kamailio] registrar: add event_callback parameter and relevant documentation (#1622)
by Ivaylo Markov 20 Aug '18

20 Aug '18

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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) - [ ] 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 #XXXX (replace XXXX with an open issue number) #### Description I've added the ability to use the `usrloc:contact-expired` event route with KEMI routing scripts. I've tested with both the native scripting language and `app_lua` and it seems to be working. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1622 -- Commit Summary -- * registrar: add event_callback parameter * registrar: docs for event_callback parameter -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (31) M src/modules/registrar/registrar.c (23) M src/modules/registrar/regpv.c (23) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1622.patch https://github.com/kamailio/kamailio/pull/1622.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/1622

2 2

git:master:98f05b7b: registrar: add event_callback parameter
by Ivaylo Markov 20 Aug '18

20 Aug '18

Module: kamailio Branch: master Commit: 98f05b7b0de4b328a71e1ff5eca175ad690a4888 URL: https://github.com/kamailio/kamailio/commit/98f05b7b0de4b328a71e1ff5eca175a… Author: Ivaylo Markov <imarkov(a)zoiper.com> Committer: Ivaylo Markov <imarkov(a)zoiper.com> Date: 2018-08-18T18:01:36+03:00 registrar: add event_callback parameter This allows usage of the `usrloc:contact-expired` event route with KEMI routing configurations. --- Modified: src/modules/registrar/registrar.c Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/98f05b7b0de4b328a71e1ff5eca175a… Patch: https://github.com/kamailio/kamailio/commit/98f05b7b0de4b328a71e1ff5eca175a… --- diff --git a/src/modules/registrar/registrar.c b/src/modules/registrar/registrar.c index 35ea204e0c..4f6e71a344 100644 --- a/src/modules/registrar/registrar.c +++ b/src/modules/registrar/registrar.c @@ -126,6 +126,9 @@ str sock_hdr_name = {0,0}; /* where to go for event route ("usrloc:contact-expired") */ int reg_expire_event_rt = -1; /* default disabled */ +str reg_event_callback = STR_NULL; + +sr_kemi_eng_t *keng = NULL; #define RCV_NAME "received" str rcv_param = str_init(RCV_NAME); @@ -228,6 +231,7 @@ static param_export_t params[] = { {"regid_mode", INT_PARAM, &reg_regid_mode }, {"flow_timer", INT_PARAM, &reg_flow_timer }, {"contact_max_size", INT_PARAM, &contact_max_size }, + {"event_callback", PARAM_STR, &reg_event_callback }, {0, 0, 0} }; @@ -339,12 +343,19 @@ static int mod_init(void) return -1; } - if(ul.register_ulcb != NULL) - { - reg_expire_event_rt = route_lookup(&event_rt, "usrloc:contact-expired"); - if (reg_expire_event_rt>=0 && event_rt.rlist[reg_expire_event_rt]==0) - reg_expire_event_rt=-1; /* disable */ - if (reg_expire_event_rt>=0) { + if(ul.register_ulcb != NULL) { + if (reg_event_callback.s==NULL || reg_event_callback.len<=0 ) { + reg_expire_event_rt = route_lookup(&event_rt, "usrloc:contact-expired"); + if (reg_expire_event_rt>=0 && event_rt.rlist[reg_expire_event_rt]==0) + reg_expire_event_rt=-1; /* disable */ + } else { + keng = sr_kemi_eng_get(); + if(keng==NULL) { + LM_DBG("event callback (%s) set, but no cfg engine\n", + reg_event_callback.s); + } + } + if (reg_expire_event_rt>=0 || (reg_event_callback.s!=NULL && keng !=NULL)) { set_child_rpc_sip_mode(); if(ul.register_ulcb(UL_CONTACT_EXPIRE, reg_ul_expired_contact, 0)< 0) { diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index b6fad8856f..fdb5fa40fb 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -34,11 +34,14 @@ #include "../../core/route.h" #include "../../core/action.h" #include "../../core/fmsg.h" +#include "../../core/kemi.h" #include "../usrloc/usrloc.h" #include "registrar.h" #include "common.h" #include "regpv.h" +extern str reg_event_callback; + typedef struct _regpv_profile { str pname; str domain; @@ -629,8 +632,9 @@ void reg_ul_expired_contact(ucontact_t* ptr, int type, void* param) int olen; int ilen; char *p; + sr_kemi_eng_t *keng = NULL; - if(reg_expire_event_rt<0) + if(reg_expire_event_rt<0 && reg_event_callback.s==NULL) return; if (faked_msg_init() < 0) @@ -733,11 +737,22 @@ void reg_ul_expired_contact(ucontact_t* ptr, int type, void* param) backup_rt = get_route_type(); set_route_type(REQUEST_ROUTE); init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[reg_expire_event_rt], fmsg, 0); + + if (reg_expire_event_rt >= 0) { + run_top_route(event_rt.rlist[reg_expire_event_rt], fmsg, 0); + } else { + keng = sr_kemi_eng_get(); + if (keng!=NULL) { + str evname = str_init("usrloc:contact-expired"); + if(keng->froute(fmsg, EVENT_ROUTE, + &reg_event_callback, &evname)<0) { + LM_ERR("error running event route kemi callback\n"); + } + } + } set_route_type(backup_rt); return; error: regpv_free_profile(rpp); - return; -} + return; }

1 0

Build failed in Jenkins: kamailiodev-nightly-binaries » i386,xenial,slave #1166
by jenkins＠sipwise.com 20 Aug '18

20 Aug '18

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> ------------------------------------------ [...truncated 640.66 KB...] CC (gcc) [kamailio] core/parser/parse_param.o CC (gcc) [kamailio] core/parser/parser_f.o CC (gcc) [kamailio] core/parser/parse_subscription_state.o CC (gcc) [kamailio] core/parser/parse_retry_after.o CC (gcc) [kamailio] core/parser/parse_addr_spec.o CC (gcc) [kamailio] core/parser/parse_rr.o CC (gcc) [kamailio] core/parser/parse_allow.o CC (gcc) [kamailio] core/parser/parse_diversion.o CC (gcc) [kamailio] core/parser/parse_cseq.o CC (gcc) [kamailio] core/parser/parse_content.o CC (gcc) [kamailio] core/parser/parse_event.o CC (gcc) [kamailio] core/parser/parse_uri.o CC (gcc) [kamailio] core/parser/parse_disposition.o CC (gcc) [kamailio] core/parser/parse_methods.o CC (gcc) [kamailio] core/parser/parse_sipifmatch.o CC (gcc) [kamailio] core/parser/parse_nameaddr.o CC (gcc) [kamailio] core/parser/parse_body.o CC (gcc) [kamailio] core/parser/hf.o CC (gcc) [kamailio] core/parser/parse_via.o CC (gcc) [kamailio] core/parser/parse_hname2.o CC (gcc) [kamailio] core/parser/parse_supported.o CC (gcc) [kamailio] core/parser/parse_rpid.o CC (gcc) [kamailio] core/parser/parse_privacy.o CC (gcc) [kamailio] core/parser/parse_identity.o CC (gcc) [kamailio] core/parser/parse_option_tags.o CC (gcc) [kamailio] core/parser/parse_fline.o CC (gcc) [kamailio] core/parser/parse_hostport.o CC (gcc) [kamailio] core/parser/parse_date.o CC (gcc) [kamailio] core/parser/parse_require.o CC (gcc) [kamailio] core/parser/parse_to.o CC (gcc) [kamailio] core/parser/parse_ppi_pai.o CC (gcc) [kamailio] core/parser/parse_identityinfo.o CC (gcc) [kamailio] core/parser/parse_refer_to.o CC (gcc) [kamailio] core/parser/parse_expires.o CC (gcc) [kamailio] core/parser/msg_parser.o CC (gcc) [kamailio] core/parser/digest/param_parser.o CC (gcc) [kamailio] core/parser/digest/digest_parser.o CC (gcc) [kamailio] core/parser/digest/digest.o CC (gcc) [kamailio] core/parser/contact/contact.o CC (gcc) [kamailio] core/parser/contact/parse_contact.o CC (gcc) [kamailio] core/parser/sdp/sdp.o CC (gcc) [kamailio] core/parser/sdp/sdp_helpr_funcs.o CC (gcc) [kamailio] core/rand/fastrand.o CC (gcc) [kamailio] core/rand/isaac/rand.o CC (gcc) [kamailio] core/cfg/cfg_select.o CC (gcc) [kamailio] core/cfg/cfg_ctx.o CC (gcc) [kamailio] core/cfg/cfg_struct.o CC (gcc) [kamailio] core/cfg/cfg_script.o CC (gcc) [kamailio] core/cfg/cfg.o bison -d -b core/cfg core/cfg.y flex -o core/lex.yy.c core/cfg.lex CC (gcc) [kamailio] core/lex.yy.o CC (gcc) [kamailio] core/cfg.tab.o LD (gcc) [kamailio] kamailio CC (gcc) [M async.so] async_sleep.o CC (gcc) [M async.so] async_mod.o LD (gcc) [M async.so] async.so CC (gcc) [M auth.so] rfc2617.o CC (gcc) [M auth.so] nid.o CC (gcc) [M auth.so] rfc2617_sha256.o CC (gcc) [M auth.so] nc.o CC (gcc) [M auth.so] api.o CC (gcc) [M auth.so] auth_mod.o CC (gcc) [M auth.so] nonce.o CC (gcc) [M auth.so] ot_nonce.o CC (gcc) [M auth.so] challenge.o CC (gcc) [L libsrutils.so.1.0] shautils.o CC (gcc) [L libsrutils.so.1.0] sruid.o CC (gcc) [L libsrutils.so.1.0] srjson.o CC (gcc) [L libsrutils.so.1.0] sha256.o CC (gcc) [L libsrutils.so.1.0] tmrec.o LD (gcc) [L libsrutils.so.1.0] libsrutils.so.1.0 LD (gcc) [M auth.so] auth.so CC (gcc) [M benchmark.so] benchmark.o LD (gcc) [M benchmark.so] benchmark.so CC (gcc) [M blst.so] blst.o LD (gcc) [M blst.so] blst.so CC (gcc) [M cfg_rpc.so] cfg_rpc.o LD (gcc) [M cfg_rpc.so] cfg_rpc.so CC (gcc) [M cfgutils.so] cfgutils.o LD (gcc) [M cfgutils.so] cfgutils.so CC (gcc) [M corex.so] corex_var.o CC (gcc) [M corex.so] corex_lib.o CC (gcc) [M corex.so] corex_nio.o CC (gcc) [M corex.so] corex_mod.o CC (gcc) [M corex.so] corex_rpc.o LD (gcc) [M corex.so] corex.so CC (gcc) [M counters.so] counters.o LD (gcc) [M counters.so] counters.so CC (gcc) [M ctl.so] binrpc.o CC (gcc) [M ctl.so] fifo_server.o CC (gcc) [M ctl.so] io_listener.o CC (gcc) [M ctl.so] binrpc_run.o CC (gcc) [M ctl.so] init_socks.o CC (gcc) [M ctl.so] ctrl_socks.o CC (gcc) [M ctl.so] ctl.o LD (gcc) [M ctl.so] ctl.so CC (gcc) [M debugger.so] debugger_json.o CC (gcc) [M debugger.so] debugger_api.o CC (gcc) [M debugger.so] debugger_config.o CC (gcc) [M debugger.so] debugger_act.o CC (gcc) [M debugger.so] debugger_mod.o make[4]: 'libsrutils.so.1.0' is up to date. LD (gcc) [M debugger.so] debugger.so CC (gcc) [M diversion.so] diversion.o LD (gcc) [M diversion.so] diversion.so CC (gcc) [M enum.so] enum.o CC (gcc) [M enum.so] enum_mod.o Build step 'Execute shell' marked build as failure Archiving artifacts ERROR: Step ‘Archive the artifacts’ aborted due to exception: java.nio.file.NoSuchFileException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> at sun.nio.fs.UnixException.translateToIOException(UnixException.java:86) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:102) at sun.nio.fs.UnixException.rethrowAsIOException(UnixException.java:107) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:218) at sun.nio.fs.UnixFileAttributeViews$Posix.readAttributes(UnixFileAttributeViews.java:131) at sun.nio.fs.UnixFileSystemProvider.readAttributes(UnixFileSystemProvider.java:144) at sun.nio.fs.LinuxFileSystemProvider.readAttributes(LinuxFileSystemProvider.java:99) at java.nio.file.Files.readAttributes(Files.java:1737) at java.nio.file.Files.getPosixFilePermissions(Files.java:2004) at hudson.util.IOUtils.mode(IOUtils.java:130) Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel$2.adapt(Channel.java:990) at hudson.remoting.Channel$2.adapt(Channel.java:986) at hudson.remoting.FutureAdapter.get(FutureAdapter.java:55) at hudson.FilePath.copyRecursiveTo(FilePath.java:2375) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) Caused: hudson.os.PosixException: Unable to get file permissions null at hudson.util.IOUtils.mode(IOUtils.java:133) at hudson.util.io.TarArchiver.visit(TarArchiver.java:92) at hudson.util.DirScanner.scanSingle(DirScanner.java:44) at hudson.FilePath$ExplicitlySpecifiedDirScanner.scan(FilePath.java:2995) at hudson.FilePath.writeToTar(FilePath.java:2432) at hudson.FilePath.access$2800(FilePath.java:210) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2397) at hudson.FilePath$CopyRecursiveRemoteToLocal.invoke(FilePath.java:2386) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused: java.io.IOException at hudson.FilePath.copyRecursiveTo(FilePath.java:2379) at jenkins.model.StandardArtifactManager.archive(StandardArtifactManager.java:61) at hudson.tasks.ArtifactArchiver.perform(ArtifactArchiver.java:235) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) TAP Reports Processing: START Looking for TAP results report in workspace using pattern: report/*.tap ERROR: Step ‘Publish TAP Results’ aborted due to exception: Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.FilePath.list(FilePath.java:1840) at hudson.FilePath.list(FilePath.java:1824) at hudson.FilePath.list(FilePath.java:1809) at org.tap4j.plugin.TapPublisher.locateReports(TapPublisher.java:647) at org.tap4j.plugin.TapPublisher.performImpl(TapPublisher.java:383) at org.tap4j.plugin.TapPublisher.perform(TapPublisher.java:371) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) java.io.IOException: <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at hudson.FilePath.glob(FilePath.java:1870) at hudson.FilePath.access$2400(FilePath.java:210) at hudson.FilePath$23.invoke(FilePath.java:1843) at hudson.FilePath$23.invoke(FilePath.java:1840) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Recording test results ERROR: Build step failed with exception Also: hudson.remoting.Channel$CallSiteStackTrace: Remote call to jenkins-debian-glue-slave (i-098d9e2880d77bd0d) at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1741) at hudson.remoting.UserRequest$ExceptionResponse.retrieve(UserRequest.java:357) at hudson.remoting.Channel.call(Channel.java:955) at hudson.FilePath.act(FilePath.java:1036) at hudson.FilePath.act(FilePath.java:1025) at hudson.tasks.junit.JUnitParser.parseResult(JUnitParser.java:114) at hudson.tasks.junit.JUnitResultArchiver.parse(JUnitResultArchiver.java:136) at hudson.tasks.junit.JUnitResultArchiver.parseAndAttach(JUnitResultArchiver.java:166) at hudson.tasks.junit.JUnitResultArchiver.perform(JUnitResultArchiver.java:153) at hudson.tasks.BuildStepCompatibilityLayer.perform(BuildStepCompatibilityLayer.java:81) at hudson.tasks.BuildStepMonitor$1.perform(BuildStepMonitor.java:20) at hudson.model.AbstractBuild$AbstractBuildExecution.perform(AbstractBuild.java:744) at hudson.model.AbstractBuild$AbstractBuildExecution.performAllBuildSteps(AbstractBuild.java:690) at hudson.model.Build$BuildExecution.post2(Build.java:186) at hudson.model.AbstractBuild$AbstractBuildExecution.post(AbstractBuild.java:635) at hudson.model.Run.execute(Run.java:1823) at hudson.matrix.MatrixRun.run(MatrixRun.java:153) at hudson.model.ResourceController.execute(ResourceController.java:97) at hudson.model.Executor.run(Executor.java:429) <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…> does not exist. at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:484) at org.apache.tools.ant.types.AbstractFileSet.getDirectoryScanner(AbstractFileSet.java:461) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:141) at hudson.tasks.junit.JUnitParser$ParseResultCallable.invoke(JUnitParser.java:118) at hudson.FilePath$FileCallableWrapper.call(FilePath.java:2917) at hudson.remoting.UserRequest.perform(UserRequest.java:212) at hudson.remoting.UserRequest.perform(UserRequest.java:54) at hudson.remoting.Request$2.run(Request.java:369) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:266) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Build step 'Publish JUnit test result report' marked build as failure

1 2

[kamailio/kamailio] [sipcapture]：parse_headers error. (#1582)
by aleczmw 20 Aug '18

20 Aug '18

Hello, Could you please help check below question about parse_headers error. Look like it cannot find a '\n' from the header body to the end of message. Is it possible? code: match=q_memchr(tmp, '\n', end-tmp); if (match){ match++; }else { ERR("bad body for <%s>(%d)\n", hdr->name.s, hdr->type); /* abort(); */ tmp=end; goto error; } Log: ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [Route: <sip:pcsf-aut] ^[[0;39;49m^[[0;31;49m 5(23) ERROR: sipcapture [sipcapture.c:1209]: sip_capture_prepare(): cannot parse headers ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [Route: <sip:pcsf-aut] ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/parse_ppi_pai.c:124]: parse_pai_header(): Error parsing PAI header ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <Route: sip:pcsf-aut1.imsgroup0-000.qa41c.imsate.lucentlab.com;lr;ottag=ue_term;bidx=12;ac(9) ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [Route: <sip:pcsf-aut] ^[[0;39;49m^[[0;31;49m 5(23) ERROR: [parser/parse_ppi_pai.c:171]: parse_ppi_header(): Error parsing PPI header ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+(50) ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 4(22) ERROR: sipcapture [sipcapture.c:1209]: sip_capture_prepare(): cannot parse headers ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+(50) ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/parse_ppi_pai.c:124]: parse_pai_header(): Error parsing PAI header ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+(50) ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 4(22) ERROR: [parser/parse_ppi_pai.c:171]: parse_ppi_header(): Error parsing PPI header ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+17053200002(50) ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 3(20) ERROR: sipcapture [sipcapture.c:1209]: sip_capture_prepare(): cannot parse headers ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+17053200002(50) ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/parse_ppi_pai.c:124]: parse_pai_header(): Error parsing PAI header ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:253]: get_hdr_field(): bad body for <P-Asserted-Identity: sip:+17053200002(50) ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/msg_parser.c:329]: parse_headers(): bad header field [P-Asserted-Identity:] ^[[0;39;49m^[[0;31;49m 3(20) ERROR: [parser/parse_ppi_pai.c:171]: parse_ppi_header(): Error parsing PPI header Thanks in advance. -- 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/1582

3 5

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev