sr-dev October 2017

sr-dev@lists.kamailio.org

33 participants
301 discussions

git:master:1bb3aeaa: presence_dialoginfo: removed svn id, history, coherent indentation
by Daniel-Constantin Mierla 24 Oct '17

24 Oct '17

Module: kamailio Branch: master Commit: 1bb3aeaaeb220af6471a7a54dead308dc05380e5 URL: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:38:12+02:00 presence_dialoginfo: removed svn id, history, coherent indentation --- Modified: src/modules/presence_dialoginfo/add_events.c Modified: src/modules/presence_dialoginfo/add_events.h Modified: src/modules/presence_dialoginfo/notify_body.c Modified: src/modules/presence_dialoginfo/notify_body.h Modified: src/modules/presence_dialoginfo/pidf.c Modified: src/modules/presence_dialoginfo/pidf.h Modified: src/modules/presence_dialoginfo/presence_dialoginfo.c Modified: src/modules/presence_dialoginfo/presence_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308… Patch: https://github.com/kamailio/kamailio/commit/1bb3aeaaeb220af6471a7a54dead308…

1 0

git:5.0:bbe47d4a: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 24 Oct '17

24 Oct '17

Module: kamailio Branch: 5.0 Commit: bbe47d4a0c43008dfa1c009e2061d90ea5556d26 URL: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-10-24T12:16:35+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/auth/README Modified: src/modules/cnxcc/README Modified: src/modules/db_postgres/README Modified: src/modules/dialog/README Modified: src/modules/domainpolicy/README Modified: src/modules/mediaproxy/README Modified: src/modules/misc_radius/README Modified: src/modules/nat_traversal/README Modified: src/modules/presence_xml/README --- Diff: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90… Patch: https://github.com/kamailio/kamailio/commit/bbe47d4a0c43008dfa1c009e2061d90…

1 0

git: new commits in branch 5.0
by Daniel-Constantin Mierla 24 Oct '17

24 Oct '17

- URL: https://github.com/kamailio/kamailio/commit/335eb8eed8009505fca8ee7859c1e45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:38:09+02:00 presence_xml: small adjustments, added section ids (cherry picked from commit 6fbaac0d9383da5fe30ea9d2e9671ab3dffd9694) - URL: https://github.com/kamailio/kamailio/commit/42d7fa47bdb9447d3522b3d233bc93b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:40:04+02:00 snmpstats: removed wrong function name from log message (cherry picked from commit e27ba180ab9801e6b32bfb31aad1c02d28f7e559) - URL: https://github.com/kamailio/kamailio/commit/270c8fce6414b8401a5d8181caa4fd5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:40:52+02:00 uid_gflags: fixed rpc commands doc strings - converted log macros - coherent indentation and whitespacing (cherry picked from commit 0281dc351ca4cde8d3343164cc3091d02808f3cb) - URL: https://github.com/kamailio/kamailio/commit/6c2630274461d33ac41217239a7436a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:41:08+02:00 jsonrpcc: more debug messages if init fails - coherent indentation and whitespacing (cherry picked from commit f60a3cfa3070a4782038dcf9f2169562220cc396) - URL: https://github.com/kamailio/kamailio/commit/dc37a5e439a23132db79a46d70ba17c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:44:48+02:00 uid_uri_db: removed history, updated application name - adjustments to log messages and indentation (cherry picked from commit f5a329ff0ce0e433c5ff8a7bfdc815819dcf1022) - URL: https://github.com/kamailio/kamailio/commit/83d4e1826e8f3f0876ccc6be0df4abf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:12+02:00 uid_uri_db: fixed log message (cherry picked from commit 6fa1e72a8e8b74876432afe47830d2ee22b1caf6) - URL: https://github.com/kamailio/kamailio/commit/50579308d7830388e379ec039167f9e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:25+02:00 uid_auth_db: removed history, updated log macros (cherry picked from commit 6eb9f46bc413b72f41423673f1ad1083775760c4) - URL: https://github.com/kamailio/kamailio/commit/9800aba65146b72623bb512049300d1… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Date: 2017-10-24T11:45:43+02:00 carrierroute: warning for the same carrier/domain having routes with only 0 probability - While starting kamailio or reloading the routes, if the same carrier/domain pairs do not have any route with a probability other than 0 (zero) then an error log will be printed on the screen. Besides, the log "invalid dice_max value" in the cr_func.c has been made more clear. (cherry picked from commit 9741bee7af8136b35af8e6279e530aa0ad54f574) - URL: https://github.com/kamailio/kamailio/commit/0dd00c1aedc14e2b5509b84468c277e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:45:57+02:00 seas: added guards to several include files - bits of formating and removal of inline history (cherry picked from commit e04716f4f9325fa5290555823132455ea599daac) - URL: https://github.com/kamailio/kamailio/commit/5eda789b9885ca27afb29ab6145dcc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:46:18+02:00 dialog: small updates to docs (cherry picked from commit e23c50aed89be717c0bc76e6fbfc902cf3deacb6) - URL: https://github.com/kamailio/kamailio/commit/c7350a733d0c000f67192943be3d925… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:48:12+02:00 rtpproxy: removed function name from log messages (cherry picked from commit 574f2d4d40fbdecf379292d65ad0218e8ecaab10) - URL: https://github.com/kamailio/kamailio/commit/0edd5072b35809a7529d413c45372f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:48:23+02:00 msrp: updates to log macros (cherry picked from commit 0e38dabe44e475e8054d3905e553637977dd26e1) - URL: https://github.com/kamailio/kamailio/commit/14bb444e8c106bf0d8ac6009ff6c47b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:50:34+02:00 core: tcp - increased the size for flags field in connection struct (cherry picked from commit 65ed9b065c497266a4ecd9760e7c168c69b4c6e8) - URL: https://github.com/kamailio/kamailio/commit/85ad34b0f5afd7fd4c560efafb940fb… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:16+02:00 cfgutils: Add fixup_free functions to (u)sleep functions (cherry picked from commit 194d1bd1d1b86a92ee51bb32d88c105eb6130910) - URL: https://github.com/kamailio/kamailio/commit/43efb087f618be3bba5fa4da15041fd… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:29+02:00 cfgutils: Allow pv in check_route_exists() and route_if_exists() These functions are somewhat useless if a dynamic parameter is not allowed. (cherry picked from commit 92e404b3676aa57bca531096cddc14d58e06c789) - URL: https://github.com/kamailio/kamailio/commit/635ff24db1e2f3439d15b9a0f3e3156… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:52:41+02:00 cfgutils: Properly handle 'exit' when from route_if_exists() exit is supposed to exit the routing script. route_if_exists() wasn't handling the exit, so script would continue to run after 'exit'. (cherry picked from commit d6a374d707f23afddfc007edfeae40b01836b3c0) - URL: https://github.com/kamailio/kamailio/commit/fe960c65c028bccd348140a4d02f23e… Author: Alex Hermann <alex(a)speakup.nl> Date: 2017-10-24T11:52:55+02:00 cfgutils: Remove debug statements in sleep functions Too much noise when debug logging is on (cherry picked from commit efe9d554a912edb0ffc5ae8e7176adc5bcc44a5e) - URL: https://github.com/kamailio/kamailio/commit/963594eaf13949a0c1e0c5e0221c8e0… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:53:07+02:00 json: Add fixup_free function for json_get_field (cherry picked from commit 305dbe7197f87d8e14bb75f14553852c8e3c9b8c) - URL: https://github.com/kamailio/kamailio/commit/2c509fdc77997c3a71add4d2b729e42… Author: Alex Hermann <alex(a)hexla.nl> Date: 2017-10-24T11:53:17+02:00 janssonrcp-c: Fix segfault in mod_destroy Check variable before dereferencing it. (cherry picked from commit 894e64ae69f485ee8b764092d255c65ab7740da7) - URL: https://github.com/kamailio/kamailio/commit/5ff6d3761a0722c5a8a18dfec3c856d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:53:35+02:00 jsonrpcc: do not declare variables in header files - avoid declaration in each .c that includes the .h (cherry picked from commit 291649821f4d19790072ffaf9aefc41891a3551d) - URL: https://github.com/kamailio/kamailio/commit/ececbd9c1753b101e12e66ed86496b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:53:45+02:00 janssonrpcc: do not lock in mod destroy - all children are killed already and if lock was already set results in a deadlock (cherry picked from commit 185db312ed91bba6c997a42a84c4da1e4ce2319f) - URL: https://github.com/kamailio/kamailio/commit/1a096c81bf36f5de3f5f6632dd041a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:54:57+02:00 dialog: adjusted debug messages when updating attributes (cherry picked from commit 47bfa060e6b182167c5d0b21cbaebf5b1c0bb8d2) - URL: https://github.com/kamailio/kamailio/commit/751aff9d26b910f0c9021d340831fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:55:16+02:00 auth: explicit listing of status codes for replies in docs of challenge functions (cherry picked from commit 4e2c3f2b41859767f13bef237b93ea7101f36d12) - URL: https://github.com/kamailio/kamailio/commit/f1921513187d432b67dd94df437f1ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:58:40+02:00 kamctl: added db subcommand to mange records in version table (cherry picked from commit d3b7f0d390dd430d40a1d47112f076f4b21e3afe) - URL: https://github.com/kamailio/kamailio/commit/24048d5cc742f9421a1ea8962190e76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:58:53+02:00 sqlops: keep string values zero-terminated inside db result structure (cherry picked from commit f90e785114c7dd738ca7ce7e70d72dd92cbd7136) - URL: https://github.com/kamailio/kamailio/commit/a91e787ebbe39e6f608e77da929c9f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T11:59:54+02:00 auth_radius: added section ids in docs (cherry picked from commit 563004ca54cb31d19e3bd9e30633c9f860070883) - URL: https://github.com/kamailio/kamailio/commit/8c9d1d8cb198dc377029db76b16be13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:13+02:00 app_mono: added section ids (cherry picked from commit 9229cb397e3afebd5e25e67713e4df9b6d622192) - URL: https://github.com/kamailio/kamailio/commit/078a253702e7ab320d346f2ed5cad58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:27+02:00 app_python: added section ids in docs (cherry picked from commit b24c3093feeb49bd6e9e508a6947fb3926c4ea8f) - URL: https://github.com/kamailio/kamailio/commit/26fa101b3019d113ef4eea870921d22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:00:52+02:00 cnxcc: added section ids in the docs (cherry picked from commit f5430eb0ad6134539d5eb4369e4c60bdb5fa4a63) - URL: https://github.com/kamailio/kamailio/commit/81712b43b3f1863f1a4d0fefada7cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:04+02:00 cplc: added section ids in docs (cherry picked from commit f460607b5b0903c0937e5272c18d1c4fed38d42d) - URL: https://github.com/kamailio/kamailio/commit/010e0fcce60adbf15f91e8049e0257c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:18+02:00 domainpolicy: removed empty rpc section - added several section ids (cherry picked from commit d94a65cbd0a86e1869037bbcfa261bc4219be908) - URL: https://github.com/kamailio/kamailio/commit/66cdd82fa174eb89cced4bb90c011dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:01:37+02:00 presence_conference: removed history and svn ids (cherry picked from commit e4cb62486644cdca753fe6c7768bd738ee19c8a5) - URL: https://github.com/kamailio/kamailio/commit/d5580542873e2a71101e625a96e855b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:08+02:00 maxfwd: fixed location for section id of maxfwd_process (cherry picked from commit 1f54f3d21a81badb4ba43c6adb88195bdd2c42f1) - URL: https://github.com/kamailio/kamailio/commit/7cdfc2083292e4ee75845aabc033797… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:24+02:00 mediaproxy: added section ids in docs (cherry picked from commit 5535a612445ea71a938e427e0ed7e3f7ea5d88cf) - URL: https://github.com/kamailio/kamailio/commit/813f0d868a076dae51a6018917dfc66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:02:36+02:00 misc_radius: end separator for examples in docs - added section ids (cherry picked from commit e49512ce80693aa2638d9fca940ded5a889cd2f9) - URL: https://github.com/kamailio/kamailio/commit/bdfbaaebdd4b4abd1f48d52e7179706… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:03:38+02:00 tm: updated some structs to typedefs (cherry picked from commit 4267e1ef7c9ffaac606964fb1b2d64334754b5d9) - URL: https://github.com/kamailio/kamailio/commit/e9106f999c9a5ec0d82bbf061ccb8ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:03:59+02:00 dialog: documented optional sdp body for rpc bridge command (cherry picked from commit 59b58035bfe8e722a696db889d5295254092ae90) - URL: https://github.com/kamailio/kamailio/commit/f39462818a109481281ad06303d9c7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:19+02:00 db_postgres: documentation for lockset parameter (cherry picked from commit 7d27b682cc6259b1f6bcd21584b9f1d5bbfc9a36) - URL: https://github.com/kamailio/kamailio/commit/09a0a36e8ce21ed0422fe8649c9cfa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:32+02:00 nat_traversal: added section ids in docs (cherry picked from commit 642dcef14271bc1376a54f8afe3a159d4e831ba6) - URL: https://github.com/kamailio/kamailio/commit/b0b77e07e10e8bbf65c991c7dae8f33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:04:59+02:00 core: fix for bitwise test in core rpc command (cherry picked from commit f662a62519f99e046caf03063147104af22ec3c3) - URL: https://github.com/kamailio/kamailio/commit/e23e875be66d4f42d18f495b5fc86e3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:05:10+02:00 core: fix bitwise test for priting socket details (cherry picked from commit 18b996262fb1c7bde94b494ce837754dc82c9e7e) - URL: https://github.com/kamailio/kamailio/commit/5d41da20a121370ec33155fe92ac94a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-24T12:08:34+02:00 pua_dialoginfo: removed svn ids, history, done indentation (cherry picked from commit 904e7435cc4206a9058602b12ba23a1d733674db)

1 0

[kamailio/kamailio] usrloc: ul.dump fixes (#1275)
by vitalikvoip 23 Oct '17

23 Oct '17

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [x] 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 ul.dump rpc procedure has two problems: - it doesn't call unlock_ulslot() for "ul.dump brief" when aor creation fails - json format of its reply is incorrect for multiple domains. They are not represented as an array of domains and this breaks "kamctl ul show" while "kamcmd ul.dump" still works. Table unlocking is safe and needs to be backported to the stable branch. New output format of "ul.dump" can be considered as a breaking change since somebody can use this command to get registered users information and parse it. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1275 -- Commit Summary -- * Fix memory leak in ldap module that happens after calling ldap_result_next() * Merge branch 'master' of https://github.com/kamailio/kamailio * tsilo: fix deadlock in ts_append() * Merge branch 'master' of https://github.com/kamailio/kamailio * ipops: new naptr_query function * Merge branch 'master' of https://github.com/kamailio/kamailio * Merge remote-tracking branch 'upstream/master' * Merge remote-tracking branch 'upstream/master' * usrloc: fix format of the ul.dump json reply * usrloc: fix usrloc slot lock in ul.dump rpc procedure * Merge branch 'master' of https://github.com/kamailio/kamailio -- File Changes -- M src/modules/usrloc/ul_rpc.c (24) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1275.patch https://github.com/kamailio/kamailio/pull/1275.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/1275

3 7

git:5.0:92a0bccd: jsonrpcs: use select on udp socket to work on non-blocking mode
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 92a0bccdc1ed5c1e00bced6a7cc996b21a9e3e60 URL: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T14:37:44+02:00 jsonrpcs: use select on udp socket to work on non-blocking mode (cherry picked from commit b57c83c936bf729bda3174803cacbf006552f2dc) --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… Patch: https://github.com/kamailio/kamailio/commit/92a0bccdc1ed5c1e00bced6a7cc996b… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4dc4740e90..3529941f1d 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/select.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -560,16 +561,29 @@ void jsonrpc_dgram_server(int rx_sock) int ret; str scmd; jsonrpc_plain_reply_t* jr = NULL; + fd_set readfds; + int n; ret = 0; while(1) { /*read the datagram*/ /* update the local config framework structures */ cfg_update(); - memset(jsonrpc_dgram_buf, 0, JSONRPC_DGRAM_BUF_SIZE); jsonrpc_dgram_reply_addr_len = sizeof(jsonrpc_dgram_reply_addr); + FD_ZERO(&readfds); + FD_SET(rx_sock, &readfds); + n = select(rx_sock+1, &readfds, 0, 0, 0); + if(n < 0) { + LM_ERR("failure in select: (%d) %s\n", errno, strerror(errno)); + continue; + } + if(!FD_ISSET(rx_sock, &readfds)) { + /* no data on udp socket */ + continue; + } + /* get the client's address */ ret = recvfrom(rx_sock, jsonrpc_dgram_buf, JSONRPC_DGRAM_BUF_SIZE, 0, (struct sockaddr*)&jsonrpc_dgram_reply_addr,

1 0

git:master:b57c83c9: jsonrpcs: use select on udp socket to work on non-blocking mode
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: b57c83c936bf729bda3174803cacbf006552f2dc URL: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T14:35:43+02:00 jsonrpcs: use select on udp socket to work on non-blocking mode --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… Patch: https://github.com/kamailio/kamailio/commit/b57c83c936bf729bda3174803cacbf0… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 4dc4740e90..3529941f1d 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <sys/socket.h> #include <sys/un.h> +#include <sys/select.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -560,16 +561,29 @@ void jsonrpc_dgram_server(int rx_sock) int ret; str scmd; jsonrpc_plain_reply_t* jr = NULL; + fd_set readfds; + int n; ret = 0; while(1) { /*read the datagram*/ /* update the local config framework structures */ cfg_update(); - memset(jsonrpc_dgram_buf, 0, JSONRPC_DGRAM_BUF_SIZE); jsonrpc_dgram_reply_addr_len = sizeof(jsonrpc_dgram_reply_addr); + FD_ZERO(&readfds); + FD_SET(rx_sock, &readfds); + n = select(rx_sock+1, &readfds, 0, 0, 0); + if(n < 0) { + LM_ERR("failure in select: (%d) %s\n", errno, strerror(errno)); + continue; + } + if(!FD_ISSET(rx_sock, &readfds)) { + /* no data on udp socket */ + continue; + } + /* get the client's address */ ret = recvfrom(rx_sock, jsonrpc_dgram_buf, JSONRPC_DGRAM_BUF_SIZE, 0, (struct sockaddr*)&jsonrpc_dgram_reply_addr,

1 0

[kamailio/kamailio] pua_dialoginfo: segfault after setting pubruri_caller_dlg_var/pubruri_callee_dlg_var (#1271)
by Sebastian Denz 23 Oct '17

23 Oct '17

### Description Kamailio is segfaulting after activating pubruri_caller_dlg_var and pubruri_callee_dlg_var from pua_dialoginfo. modparam("pua_dialoginfo", "use_pubruri_avps", 1) //modparam("pua_dialoginfo", "pubruri_caller_avp", "$avp(s:pubruris_caller)") //modparam("pua_dialoginfo", "pubruri_callee_avp", "$avp(s:pubruris_callee)") modparam("pua_dialoginfo", "pubruri_caller_dlg_var", "pubruri_caller") modparam("pua_dialoginfo", "pubruri_callee_dlg_var", "pubruri_callee") When i comment the corresponding lines and switch back to the regular avps Kamailio runs without problems. ### Troubleshooting #### Reproduction In my setup it seems to be sufficient to just set the module parameters to provoke the segfault. I dont have to wait for any SIP-Traffic or accessing the dlg_vars. Kamailio segfaults while starting. #### Debugging Data  ``` [root@kamroute ~]# gdb /usr/sbin/kamailio /core.6547 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-100.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/usr/sbin/kamailio.debug...done. done. [New LWP 6547] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /var/run/kamailio/kamailio.pid -f /etc/kamailio/kamailio_'. Program terminated with signal 11, Segmentation fault. #0 __strlen_sse2 () at ../sysdeps/x86_64/strlen.S:31 31 movdqu (%rdi), %xmm1 (gdb) bt full #0 __strlen_sse2 () at ../sysdeps/x86_64/strlen.S:31 No locals. #1 0x00007fc7c61786c4 in mod_init () at pua_dialoginfo.c:692 bind_pua = 0x7fc7c6396b88 <bind_pua> s = {s = 0x0, len = -969002120} avp_spec = {type = 397561584, getf = 0x7fc7ce3b8827 <__fprintf+135>, setf = 0x3, pvp = {pvn = {type = 48, nfree = 0x7ffd17b24e80, u = {isname = {type = 397561264, name = {n = 7976200, s = {s = 0x79b508 "DEBUG", len = 397562576}, re = 0x79b508}}, dname = 0x7ffd17b24db0}}, pvi = {type = 0, u = {ival = 6547, dval = 0x1993}}}, trans = 0x79b508} __FUNCTION__ = "mod_init" #2 0x00000000005661e2 in init_mod (m=0x7fc7cdbd3ac0) at core/sr_module.c:966 __FUNCTION__ = "init_mod" #3 0x0000000000565f1e in init_mod (m=0x7fc7cdbd3e50) at core/sr_module.c:963 __FUNCTION__ = "init_mod" #4 0x0000000000566519 in init_modules () at core/sr_module.c:995 t = 0x20000003e4 i = 994 __FUNCTION__ = "init_modules" #5 0x00000000004293e1 in main (argc=13, argv=0x7ffd17b252d8) at main.c:2584 cfg_stream = 0x254c010 c = -1 r = 397562176 tmp = 0x7ffd17b256e0 "" tmp_len = 0 port = 0 proto = 0 options = 0x737a20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 286186509 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 18, st_ino = 37027, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 2, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1507876455, tv_nsec = 469604021}, st_mtim = {tv_sec = 1507878072, tv_nsec = 553083864}, st_ctim = {tv_sec = 1507878072, tv_nsec = 553083864}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) info locals cfg_stream = 0x254c010 c = -1 r = 397562176 tmp = 0x7ffd17b256e0 "" tmp_len = 0 port = 0 proto = 0 options = 0x737a20 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 286186509 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 18, st_ino = 37027, st_nlink = 2, st_mode = 16832, st_uid = 996, st_gid = 2, __pad0 = 0, st_rdev = 0, st_size = 60, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1507876455, tv_nsec = 469604021}, st_mtim = { tv_sec = 1507878072, tv_nsec = 553083864}, st_ctim = {tv_sec = 1507878072, tv_nsec = 553083864}, __unused = {0, 0, 0}} __FUNCTION__ = "main" (gdb) list 26 mov %edi, %ecx 27 and $0x3f, %ecx 28 pxor %xmm0, %xmm0 29 cmp $0x30, %ecx 30 ja L(next) 31 movdqu (%rdi), %xmm1 32 pcmpeqb %xmm1, %xmm0 33 pmovmskb %xmm0, %edx 34 test %edx, %edx 35 jnz L(exit_less16) (gdb) ``` #### Log Messages  Nothing which seems to be interesting. Kamailios last words are: ``` 0(7450) DEBUG: <core> [core/sr_module.c:965]: init_mod(): pua_dialoginfo 0(7450) DEBUG: <core> [core/sr_module.c:694]: find_mod_export_record(): find_export_record: found <bind_pua> in module pua [/usr/lib64/kamailio/modules/pua.so] 0(7450) DEBUG: <core> [core/sr_module.c:694]: find_mod_export_record(): find_export_record: found <load_dlg> in module dialog [/usr/lib64/kamailio/modules/dialog.so] 0(7448) ERROR: <core> [core/daemonize.c:303]: daemonize(): Main process exited before writing to pipe ``` #### SIP Traffic  ``` no SIP Traffic needed ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@kamroute ~]# kamailio -v version: kamailio 5.0.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 12:31:32 Sep 20 2017 with gcc 4.8.2 [root@kamroute ~]# rpm -qa|grep kamail kamailio-presence-5.0.3-10.el7.x86_64 kamailio-outbound-5.0.3-10.el7.x86_64 kamailio-debuginfo-5.0.3-10.el7.x86_64 kamailio-5.0.3-10.el7.x86_64 kamailio-ims-5.0.3-10.el7.x86_64 kamailio-xmpp-5.0.3-10.el7.x86_64 kamailio-mysql-5.0.3-10.el7.x86_64 [root@kamroute ~]# ``` * **Operating System**:  Up2date RHEL7. ``` [root@kamroute ~]# cat /etc/redhat-release Red Hat Enterprise Linux Server release 7.4 (Maipo) [root@kamroute ~]# uname -a Linux kamroute.intranet.mydomain.de 3.10.0-514.26.1.el7.x86_64 #1 SMP Tue Jun 20 01:16:02 EDT 2017 x86_64 x86_64 x86_64 GNU/Linux [root@kamroute ~]# ``` If you need any further information just let me know! -- 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/1271

2 2

git:5.0:114acb1d: pua_dialoginfo: fixed condition in mod init checking avp names
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: 5.0 Commit: 114acb1d4c94846e1371e476237fc62e57f90bb0 URL: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:42:47+02:00 pua_dialoginfo: fixed condition in mod init checking avp names (cherry picked from commit 666c9d1fcdde00dbdd2e87ff797e554af6d72b5c) --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… Patch: https://github.com/kamailio/kamailio/commit/114acb1d4c94846e1371e476237fc62… --- diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index c6251840e0..a544f1fd4c 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -584,7 +584,7 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) struct sip_msg *request = _params->req; struct dlginfo_cell *dlginfo; - if (request->REQ_METHOD != METHOD_INVITE) + if (request==NULL || request->REQ_METHOD != METHOD_INVITE) return; if(send_publish_flag > -1 && !(request->flags & (1<<send_publish_flag))) @@ -682,8 +682,8 @@ static int mod_init(void) if(use_pubruri_avps) { - if(!(pubruri_caller_avp && *pubruri_caller_avp) - && (pubruri_callee_avp && *pubruri_callee_avp)) { + if((pubruri_caller_avp==NULL || *pubruri_caller_avp==0) + || (pubruri_callee_avp==NULL || *pubruri_callee_avp==0)) { LM_ERR("pubruri_caller_avp and pubruri_callee_avp must be set," " if use_pubruri_avps is enabled\n"); return -1;

1 0

git:master:f9a59248: pua_dialoginfo: debug message to show whether avps are used or not
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: f9a59248dccfb95453a48d63ac5ad90bc6c745e5 URL: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:46:01+02:00 pua_dialoginfo: debug message to show whether avps are used or not - adjusted code format to avoid very long line --- Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90… Patch: https://github.com/kamailio/kamailio/commit/f9a59248dccfb95453a48d63ac5ad90…

1 0

git:master:904e7435: pua_dialoginfo: removed svn ids, history, done indentation
by Daniel-Constantin Mierla 23 Oct '17

23 Oct '17

Module: kamailio Branch: master Commit: 904e7435cc4206a9058602b12ba23a1d733674db URL: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-10-23T10:33:28+02:00 pua_dialoginfo: removed svn ids, history, done indentation --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.h --- Diff: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1… Patch: https://github.com/kamailio/kamailio/commit/904e7435cc4206a9058602b12ba23a1…

1 0

← Newer
1
...
16
17
18
19
20
21
22
...
31
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2017