sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

by mojtabaesfandiari

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2207 -- Commit Summary -- * Makefile.defs: version set to 5.2.0-rc0 * pkg/kamailio/deb: version set 5.2.0~rc0 * Makefile.defs: use $(prefix) for setting share_target * evapi: convert return code for kemi functions to match the ones from cfg equivalents * ims_ipsec_pcscf: Makefile - use pkg-config to get compile flags for libmnl * pkg/kamailio/alpine: Fixed docker image build for 5.2 branch * Merge pull request #1713 from sergey-safarov/spec_update9 * pkg/kamailio/deb: wait for network to be up * pkg/kamailio/deb: also restart service if unclean exit code * pkg/kamailio/oracle: wait for network to be up * pkg/kamailio/obs: update spec to mach currently used * pkg/kamailio/obs: Fixed missing libmnl-devel and librabbitmq-devel on RHEL dists * pkg/kamailio/obs: smsops module relocated into main rpm package * db_berkeley: fix compilation warning * kazoo: fix compilation warnings * pkg/kamailio/obs: Fixed build on OpenSUSE dists * pkg/kamailio/obs: Changed rpm package group for OpenSUSE dist * cfgutils: error log message mentioning the param lock_set_size * tmx: use branch index for $T_rpl() cache invalidation * lib/srdb1: added entities to define the size for event and etag columns * kamctl: regenerated the sql creation scripts * lib/srdb1: schema - use etag size entity also for pua and xcap tables * kamctl: new update to the sql creation scripts * websocket: aligned example statements * dispatcher: search in xavp sublist for ds_update_dst() attributes * htable: init vars in ht_dmq_handle_sync() to avoid compile warnings * htable: use local variable for name in log message instead of null htable pointer * db_redis: log message if failure to get reply * tm: t_serial - safety check for searched xavps * smsops: free after error log message printing a field * siptrace: convert status code to string using static buffer function * presence: safety check for structure vars before accessing fields * Makefile.defs: version set to 5.2.0-rc1 * pkg/kamailio/deb: version set to 5.2.0~rc1 * dialog: fix typo in warn message (#1731) * lib/srdb1: schema - defined entities for sizes of aname and avalue columns * kamctl: regenerated sql creation scripts * core : add word to log get_boundary function * textops: fixed get_body_part function for non-multipart contents error * core: function to test if a msg structure is faked request * async: return error if trying to execute for faked message * topos: allow various replies for INVITE without contact * htable: safety checks for values replicated via dmq * tm: info log message if attempting to create transaction for faked request * tmx: do no suspend faked request * rtpengine: print command in log message on timeout * topos: do not add contact header in outgoing 1xx responses if not present * core: added kemi KSR.is_myself_srcip() * dispatcher: ds_select_routes() - set r-uri/d-uri even when first group has no available dst * misc/examples/kemi: Added 'msg' argument to ksr_route_relay * topoh: safety checks for couple of mandatory headers * topos: safety checks for couple of mandatory headers * topos: proper condition to detect 3xx redirect for contact updates * Makefile.defs: version set to 5.2.0-rc2 * pkg/kamailio/deb: version set to 5.2.0~rc2 * xmlrpc: added event_callback parameter * xmlrpc: docs for event_callback parameter * misc/examples: use core reply_route inside the anycast example * textops: docs - notes that msg_apply_changes() may be required for multi-part operations * modules: readme files regenerated - modules ... [skip ci] * pkg/kamailio/deb: version set 5.2.0 * ChangeLog: initial update for preparing v5.2.0 * pkg: version set to 5.2.0 for alpine and oracle linux rpm specs * INSTALL: added link to the install tutorial on the web * Makefile.defs: version set to 5.2.0 * ChangeLog: content updated for v5.2.0 * utils/kamctl: [pgsql] add missing options for pgsql_ro_query() * presence: test if event is dialog when attempting to delete old records * dispatcher: docs - make a bullet list for the possible values for flags field * dispatcher: rename internal functions to match the module pattern * dispatcher: flag 16 (1<<4) for destinations with host not having A/AAAA record * dispatcher: docs for flags value 16 * core: parse body - debug instead of error log message when mime mismatch * ims_charging : doc is fixed * dialog: safety checks for local cseq and contact vars * modules: readme files regenerated - modules ... [skip ci] * core: fixed segmentation fault when handling multipart bodies * pkg/kamailio/deb: add kamailio-ruby-modules [skip ci] * pkg/kamailio/deb: remove ruby support from wheezy and precise [skip ci] * pkg/kamailio/deb: remove ruby support for trusty [skip ci] * pkg/kamailio/obs: Fixed warning about not existen kamailio group [skip ci] * pkg/kamailio/alpine: Added app-ruby package #1761 [skip ci] * pkg/docker Updated submodule * pkg/kamailio/obs: Added ruby package #1761 [skip ci] * pkg/kamailio/deb: add kamailio-python3-modules * core: fix an error in check_via_address, reported from Mojtaba, mespio at gmail dot com * core: check for optarg before passing it to external library (coverity report) * cdp: fix three coverity errors (ressource leaks and error checks) * cdp: fix two errors from coverty scan (missing check, var initialization) * dialog: check for cseq value only when getting it for caller/request * kamdbctl: Merged patch from alpine packaging (#1786) * lib/srdb1: memset db connection structure earlier in db_bind_mod() * tm: reply_received() - simplify locking for processing sip response * rtpengine : crash is fixed and codec flags added to doc (#1742) * auth_xkeys: clone value before inserting the lump inside auth_xkeys_add() * misc/examples: kamailio-basic-kemi-python.py - use functions for method and myself checks * misc/examples: sample default config with websocket enabled * dialog: store call-id, r-uri, f-uri and t-uri with 0-ending char * misc/example/kemi: merge condition lines in kamailio-basic-kemi-python.py * app_jsdt: updated duktape js engine to v2.3.0 * misc/examples/kemi/kamailio-basic-kemi-jsdt.js: use functions to match methods and myself * misc/examples/kemi/kamailio-basic-kemi-lua.lua: fix condition on user agent * misc/examples/kemi/kamailio-basic-kemi-python.py: fix condition on user agent * misc/examples/kemi/kamailio-basic-kemi-jsdt.js: removed extra parenthesis * misc/examples/kemi/kamailio-basic-kemi-jsdt.js: match from uri myself with function * misc/examples/kemi/kamailio-basic-kemi-sqlang.js: use functions to match methods and myself * pv: {param.count} accept static string "," as delimiter * app_ruby: Makefile - fixed libs for darwin os with no pkg-config * tm: error log message about new final reply made info * app_ruby: Makefile - updated how to detect ruby version * app_ruby: implemented rpc app_ruby.reload command * app_ruby: print new script version in rpc reload info message * app_python3: fix Python 3.7 deprecation warnings * uac_redirect: docs - added section ids * app_ruby: added missing app_ruby.api_list rpc command * uac_redirect: docs - fixed missing space in sectionid * regex: init var to avoid compile warning * cplc: init var to avoid compile warning * topoh: fixed unmask route issue, if maksing fails for one of the routes * topoh: aded debug message for knowing the reason of no decoding rr * websocket: use the list with ids for ws connections to do ping-pong * websocket: fetch ws connections based on keepalive process index * websocket: destroy ws connections in dedicated timer process * websocket: docs for timer_interval and rm_delay_interval params * ndb_redis: fix compilation warnings * topos_redis: fix compilation warnings * cnxcc: fix compilation warnings * dialog: only write debug messages in case cseq or contact fields are empty * websocket: removed static from declaration of ws_rm_delay_interval * db_redis: use safe clist iteration for db_redis_free_tables() * cdp: init pointer to avoid warning on uninitialized use * rtpengine: lock only when db backend is enabled for build_rtpp_socks() * auth_db: print db table name when version check fails * core: function to detect if all processes were forked * core: added function to detect when processes were initialized * rtpengine: reworked build of rtpengine sockets to avoid serial initialization * rtpengine: use version number to track building rtpengine sockets on reload * ims_isc: free variable in case of errors * core: pt - added missing #endif due to backport conflict * modules: readme files regenerated - modules ... [skip ci] * acc_json: proper check if the mqueue name is set and the module can be loaded * topos_redis: check the branch value to avoid using uninitialized fields * tm: Add fixup for PVS in fixup_t_check_status * phonenum: fixing documentation typo (#1807) * modules: readme files regenerated - modules ... [skip ci] * dialog: docs - more info about using the flag and dlg_manage() * dialog: do not require dlg_flag parameter to be set * tsilo: add check for empty aor * dispatcher: update for module docs (#1804) * dispatcher: docs - typo and indentation for the rpc flags paragraph * presence: Makefile - link agaist libicu on macos/darwin * presence_xml: Makefile - link agaist libicu on macos/darwin * presence: do not include presence.h in other header files * presence_xml: do not include ../presence/presence.h * modules: readme files regenerated - modules ... [skip ci] * pkg: version set to 5.2.1 for alpine and rpm specs * pkg/debian: set version to 5.2.1 in deb spec files * Makefile.defs: version set to 5.2.1 * ChangeLog: content updated for v5.2.1 * siptrace: don't calculate message source socket if already set * tsilo: fixed ts_append example in the doc * modules: readme files regenerated - modules ... [skip ci] * websocket: put the ws connection after keepalive * src/Makefile: added target to install files for systemd on debian * jsonrpcs: Fix memleak with srjson_doc_t * jansson: Log column on parse error * dispatcher: Don't take modulus of hash twice * siputils: Return true if options_reply() succeeds * jansson: Fix reverse logic for JSON boolean * dispatcher: Stop searching if entry is found * dispatcher: Fix memleak in destination attributes * jsonrpcs: fix double free crash * core: fix crashes and logical errors for cmd line parsing, reported from Thuan Pham * registrar : check xavp clone result * lreproxy module -- File Changes -- M ChangeLog (21521) M INSTALL (2) M misc/examples/kemi/kamailio-basic-kemi-jsdt.js (67) M misc/examples/kemi/kamailio-basic-kemi-lua.lua (4) M misc/examples/kemi/kamailio-basic-kemi-python.py (52) M misc/examples/kemi/kamailio-basic-kemi-sqlang.sq (65) M misc/examples/mixed/kamailio-minimal-anycast.cfg (18) A misc/examples/webrtc/kamailio-default-websocket.cfg (1019) M pkg/docker (2) D pkg/kamailio/alpine/0001-kamdbctl.base.patch (57) M pkg/kamailio/alpine/APKBUILD (22) M pkg/kamailio/deb/bionic/changelog (30) M pkg/kamailio/deb/bionic/control (38) M pkg/kamailio/deb/bionic/kamailio.service (5) M pkg/kamailio/deb/bionic/rules (4) M pkg/kamailio/deb/buster/changelog (30) M pkg/kamailio/deb/buster/control (38) M pkg/kamailio/deb/buster/kamailio.service (5) M pkg/kamailio/deb/buster/rules (4) M pkg/kamailio/deb/debian/backports/precise (12) M pkg/kamailio/deb/debian/backports/trusty (6) M pkg/kamailio/deb/debian/backports/wheezy (12) M pkg/kamailio/deb/debian/changelog (30) M pkg/kamailio/deb/debian/control (48) M pkg/kamailio/deb/debian/kamailio.service (5) M pkg/kamailio/deb/debian/rules (4) M pkg/kamailio/deb/jessie/changelog (30) M pkg/kamailio/deb/jessie/control (38) M pkg/kamailio/deb/jessie/kamailio.service (5) M pkg/kamailio/deb/jessie/rules (4) M pkg/kamailio/deb/precise/changelog (30) M pkg/kamailio/deb/precise/rules (2) M pkg/kamailio/deb/sid/changelog (30) M pkg/kamailio/deb/sid/control (38) M pkg/kamailio/deb/sid/kamailio.service (5) M pkg/kamailio/deb/sid/rules (4) M pkg/kamailio/deb/stretch/changelog (30) M pkg/kamailio/deb/stretch/control (38) M pkg/kamailio/deb/stretch/kamailio.service (5) M pkg/kamailio/deb/stretch/rules (4) M pkg/kamailio/deb/trusty/changelog (30) M pkg/kamailio/deb/trusty/control (20) M pkg/kamailio/deb/trusty/rules (4) M pkg/kamailio/deb/wheezy/changelog (30) M pkg/kamailio/deb/wheezy/rules (2) M pkg/kamailio/deb/xenial/changelog (30) M pkg/kamailio/deb/xenial/control (38) M pkg/kamailio/deb/xenial/kamailio.service (5) M pkg/kamailio/deb/xenial/rules (4) M pkg/kamailio/obs/kamailio.service (5) M pkg/kamailio/obs/kamailio.spec (258) M pkg/kamailio/obs/kamailio.tmpfiles (2) M pkg/kamailio/oracle/el6/kamailio.spec (2) M pkg/kamailio/oracle/el7/kamailio.service (3) M pkg/kamailio/oracle/el7/kamailio.spec (2) M src/Makefile (23) M src/Makefile.defs (9) M src/core/fmsg.c (5) M src/core/fmsg.h (1) M src/core/kemi.c (25) M src/core/msg_translator.c (8) M src/core/parser/parse_body.c (6) M src/core/pt.c (52) M src/core/pt.h (6) M src/core/sr_module.c (10) M src/lib/srdb1/db.c (11) M src/lib/srdb1/schema/entities.xml (4) M src/lib/srdb1/schema/location_attrs.xml (4) M src/lib/srdb1/schema/pr_presentity.xml (6) M src/lib/srdb1/schema/pr_pua.xml (2) M src/lib/srdb1/schema/pr_xcap.xml (2) M src/main.c (85) M src/modules/acc_json/acc_json_mod.c (3) M src/modules/app_jsdt/duk_config.h (132) M src/modules/app_jsdt/duktape.c (5989) M src/modules/app_jsdt/duktape.h (118) M src/modules/app_python3/app_python3_mod.c (8) M src/modules/app_python3/python_support.c (16) M src/modules/app_python3/python_support.h (5) M src/modules/app_ruby/Makefile (20) M src/modules/app_ruby/app_ruby_api.c (105) M src/modules/async/async_mod.c (16) M src/modules/auth_db/auth_db_mod.c (3) M src/modules/auth_xkeys/auth_xkeys.c (11) M src/modules/cdp/diameter_msg.c (2) M src/modules/cdp/receiver.c (27) M src/modules/cfgutils/cfgutils.c (4) M src/modules/cnxcc/cnxcc_redis.c (6) M src/modules/cplc/cpl_run.c (2) M src/modules/db_berkeley/db_berkeley.c (2) M src/modules/db_redis/redis_connection.c (4) M src/modules/db_redis/redis_table.c (6) M src/modules/dialog/README (11) M src/modules/dialog/dialog.c (4) M src/modules/dialog/dlg_db_handler.c (4) M src/modules/dialog/dlg_handlers.c (18) M src/modules/dialog/dlg_hash.c (23) M src/modules/dialog/doc/dialog_admin.xml (13) M src/modules/dispatcher/README (45) M src/modules/dispatcher/dispatch.c (44) M src/modules/dispatcher/dispatch.h (41) M src/modules/dispatcher/dispatcher.c (13) M src/modules/dispatcher/doc/dispatcher_admin.xml (54) M src/modules/evapi/evapi_mod.c (25) M src/modules/htable/ht_dmq.c (38) M src/modules/ims_charging/README (15) M src/modules/ims_charging/doc/ims_charging_admin.xml (7) M src/modules/ims_ipsec_pcscf/Makefile (15) M src/modules/ims_isc/checker.c (5) M src/modules/jansson/jansson_funcs.c (6) M src/modules/jansson/jansson_utils.c (2) M src/modules/jsonrpcs/jsonrpcs_mod.c (1) M src/modules/kazoo/kz_amqp.c (18) A src/modules/lreproxy/README.md (1) A src/modules/lreproxy/lreproxy.c (1976) A src/modules/lreproxy/lreproxy.h (120) A src/modules/lreproxy/lreproxy_funcs.c (460) A src/modules/lreproxy/lreproxy_funcs.h (41) A src/modules/lreproxy/lreproxy_hash.c (521) A src/modules/lreproxy/lreproxy_hash.h (70) M src/modules/ndb_redis/redis_client.c (6) M src/modules/phonenum/README (8) M src/modules/phonenum/doc/phonenum_admin.xml (2) M src/modules/presence/Makefile (11) M src/modules/presence/hash.h (1) M src/modules/presence/presence.c (21) M src/modules/presence/presence.h (2) M src/modules/presence/presence_dmq.c (19) M src/modules/presence/presence_dmq.h (1) M src/modules/presence/presentity.c (19) M src/modules/presence/presentity.h (1) M src/modules/presence/subscribe.h (1) M src/modules/presence_xml/Makefile (11) M src/modules/presence_xml/presence_xml.c (13) M src/modules/presence_xml/presence_xml.h (1) M src/modules/pv/pv_trans.c (45) M src/modules/regex/regex_mod.c (2) M src/modules/registrar/lookup.c (31) M src/modules/rtpengine/README (29) M src/modules/rtpengine/doc/rtpengine_admin.xml (36) M src/modules/rtpengine/rtpengine.c (121) M src/modules/siptrace/siptrace.c (32) M src/modules/siputils/options.c (4) M src/modules/smsops/smsops_impl.c (2) M src/modules/textops/README (14) M src/modules/textops/doc/textops_admin.xml (17) M src/modules/textops/textops.c (19) M src/modules/tm/t_lookup.c (5) M src/modules/tm/t_reply.c (56) M src/modules/tm/t_serial.c (12) M src/modules/tm/tm.c (3) M src/modules/tmx/t_var.c (7) M src/modules/tmx/tmx_mod.c (6) M src/modules/topoh/th_msg.c (9) M src/modules/topoh/topoh_mod.c (6) M src/modules/topos/topos_mod.c (6) M src/modules/topos/tps_msg.c (14) M src/modules/topos/tps_storage.c (12) M src/modules/topos_redis/topos_redis_storage.c (11) M src/modules/tsilo/README (2) M src/modules/tsilo/doc/tsilo_admin.xml (2) M src/modules/tsilo/ts_store.c (5) M src/modules/uac_redirect/doc/uac_redirect_admin.xml (22) M src/modules/websocket/README (52) M src/modules/websocket/doc/websocket_admin.xml (50) M src/modules/websocket/websocket.c (40) M src/modules/websocket/ws_conn.c (232) M src/modules/websocket/ws_conn.h (16) M src/modules/websocket/ws_frame.c (32) M src/modules/xmlrpc/README (44) M src/modules/xmlrpc/doc/xmlrpc_admin.xml (41) M src/modules/xmlrpc/xmlrpc.c (56) M utils/kamctl/db_sqlite/presence-create.sql (6) M utils/kamctl/db_sqlite/usrloc-create.sql (2) M utils/kamctl/kamctl.pgsql (4) M utils/kamctl/kamdbctl.base (30) M utils/kamctl/mysql/presence-create.sql (6) M utils/kamctl/mysql/usrloc-create.sql (2) M utils/kamctl/oracle/presence-create.sql (6) M utils/kamctl/oracle/usrloc-create.sql (2) M utils/kamctl/postgres/presence-create.sql (6) M utils/kamctl/postgres/usrloc-create.sql (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2207.patch https://github.com/kamailio/kamailio/pull/2207.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/2207

4 years, 11 months

git:master:b9da65bc: sqlops: exported sql_result_get() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b9da65bcf0dea2740be9ddb2773d99e178d07117 URL: https://github.com/kamailio/kamailio/commit/b9da65bcf0dea2740be9ddb2773d99e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T10:32:49+01:00 sqlops: exported sql_result_get() to kemi - return value of sql query result by id, row and column --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/b9da65bcf0dea2740be9ddb2773d99e… Patch: https://github.com/kamailio/kamailio/commit/b9da65bcf0dea2740be9ddb2773d99e… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 3943b1b81a..7172bcc8b4 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -531,6 +531,56 @@ static int ki_sqlops_is_null(sip_msg_t *msg, str *sres, int i, int j) return sqlops_is_null(sres, i, j); } +/** + * + */ +static sr_kemi_xval_t _ksr_kemi_sqlops_xval = {0}; + + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, int col) +{ + sql_result_t *res = NULL; + + memset(&_ksr_kemi_sqlops_xval, 0, sizeof(sr_kemi_xval_t)); + + if (resid == NULL || resid->s == NULL || resid->len == 0) { + LM_ERR("invalid result name\n"); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + return &_ksr_kemi_sqlops_xval; + } + + res = sql_get_result(resid); + if(res==NULL) { + LM_ERR("invalid result container [%.*s]\n", resid->len, resid->s); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + return &_ksr_kemi_sqlops_xval; + } + + if(row >= res->nrows) { + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + return &_ksr_kemi_sqlops_xval; + } + if(col >= res->ncols) { + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + return &_ksr_kemi_sqlops_xval; + } + if(res->vals[row][col].flags&PV_VAL_NULL) { + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + return &_ksr_kemi_sqlops_xval; + } + if(res->vals[row][col].flags&PV_VAL_INT) { + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.v.n = res->vals[row][col].value.n; + return &_ksr_kemi_sqlops_xval; + } + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.v.s = res->vals[row][col].value.s; + return &_ksr_kemi_sqlops_xval; +} + /** * */ @@ -571,6 +621,11 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_result_get"), + SR_KEMIP_XVAL, ki_sqlops_result_get, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 11 months

git:master:3f52de27: sipdump: kemi exports to get src/dst ip of the message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f52de273c359b60d0504e24b60401b5d1db2403 URL: https://github.com/kamailio/kamailio/commit/3f52de273c359b60d0504e24b60401b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T10:15:09+01:00 sipdump: kemi exports to get src/dst ip of the message --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3f52de273c359b60d0504e24b60401b… Patch: https://github.com/kamailio/kamailio/commit/3f52de273c359b60d0504e24b60401b… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 1b77d13508..d686dc897e 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -504,6 +504,38 @@ static sr_kemi_xval_t* ki_sipdump_get_tag(sip_msg_t *msg) return &_ksr_kemi_sipdump_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_sipdump_get_src_ip(sip_msg_t *msg) +{ + memset(&_ksr_kemi_sipdump_xval, 0, sizeof(sr_kemi_xval_t)); + + if (sipdump_event_info==NULL) { + sr_kemi_xval_null(&_ksr_kemi_sipdump_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_sipdump_xval; + } + _ksr_kemi_sipdump_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sipdump_xval.v.s = sipdump_event_info->src_ip; + return &_ksr_kemi_sipdump_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_sipdump_get_dst_ip(sip_msg_t *msg) +{ + memset(&_ksr_kemi_sipdump_xval, 0, sizeof(sr_kemi_xval_t)); + + if (sipdump_event_info==NULL) { + sr_kemi_xval_null(&_ksr_kemi_sipdump_xval, SR_KEMI_XVAL_NULL_EMPTY); + return &_ksr_kemi_sipdump_xval; + } + _ksr_kemi_sipdump_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sipdump_xval.v.s = sipdump_event_info->dst_ip; + return &_ksr_kemi_sipdump_xval; +} + /** * */ @@ -524,6 +556,16 @@ static sr_kemi_t sr_kemi_sipdump_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sipdump"), str_init("get_src_ip"), + SR_KEMIP_XVAL, ki_sipdump_get_src_ip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sipdump"), str_init("get_dst_ip"), + SR_KEMIP_XVAL, ki_sipdump_get_dst_ip, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

4 years, 11 months

git:5.1:c0fa8c17: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.1 Commit: c0fa8c174211164a3b7e1557978c2bb34c4106ae URL: https://github.com/kamailio/kamailio/commit/c0fa8c174211164a3b7e1557978c2bb… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-28T09:31:48+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/db_cassandra/README Modified: src/modules/kex/README Modified: src/modules/rtpproxy/README Modified: src/modules/seas/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/c0fa8c174211164a3b7e1557978c2bb… Patch: https://github.com/kamailio/kamailio/commit/c0fa8c174211164a3b7e1557978c2bb…

4 years, 11 months

git: new commits in branch 5.1

by Daniel-Constantin Mierla

- URL: https://github.com/kamailio/kamailio/commit/c85b70e398f6ff0ab6a8d61ab383ebd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:58:12+01:00 db_cassandra: docs - note about the state of the module (cherry picked from commit 39b7b4073465fd5343297683c59d75510c87d195) (cherry picked from commit 438df8714322ef9d100452a5f5f2c33304bb2957) - URL: https://github.com/kamailio/kamailio/commit/caeb0d30676eea074d8937401653481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:59:38+01:00 db_mysql: fixed typo in comments (timout -> timeout) (cherry picked from commit 75e0e0f4d693e207d2035f84c3e1ddc9cc715ec4) (cherry picked from commit df08856b7570ee477e1aaa49d0550e8541f19f02) - URL: https://github.com/kamailio/kamailio/commit/0c606c0b74cc0a5137d5e27224ce54c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:59:52+01:00 sms: fixed typo in comments (timout -> timeout) (cherry picked from commit 5631338036c405b1e8c7fe8a1e320db2eb63c3f9) (cherry picked from commit 342e1dcdd8d59269efe93f4c3e7651d4019e2dd5) - URL: https://github.com/kamailio/kamailio/commit/be5035c883ecad52f29db4ee2d883b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:00:22+01:00 ims_qos: fixed typo in comments (timout -> timeout) (cherry picked from commit a6caed41166e555d7297abbae6017c5c54262662) (cherry picked from commit 77c4bd3207173f7e43e67e553fb47f1f260c166e) - URL: https://github.com/kamailio/kamailio/commit/bd2187dc6cb7ffb10bc6d3a79be2e6f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:00:54+01:00 jsonrpcc: removed old todo file (cherry picked from commit fa5f36454f2ef5fb4e55dd05f746430d9786e842) (cherry picked from commit 3bd97b2ddaf537cad9f937485ec94391f78b17a1) - URL: https://github.com/kamailio/kamailio/commit/bef347143295ab029b99ed935e1087f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:01:13+01:00 core: init local structs to avoid use of garbage values (cherry picked from commit dfe8db758f84f5e88e0cb35b80a65dcd48158897) (cherry picked from commit 7c219b4a7a2e6a8448d72789587ca10f27fcf36c) - URL: https://github.com/kamailio/kamailio/commit/04716364068d9ae0f3c22ea51f10b8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:01:31+01:00 speeddial: fix stripping domain prefix - increment the index after the value is adjusted (cherry picked from commit 6861995e417c40e9ab530d4c0bed97c57de184fd) (cherry picked from commit 7829be6555b1da66a3802b713304cb28a5ff29a3) - URL: https://github.com/kamailio/kamailio/commit/2973e7627814326e788cd810921fd8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:01:51+01:00 pdt: init len variable to avoid using garbage value (cherry picked from commit 47e0649eca286bfc26c39dd1142169fc06eea077) (cherry picked from commit fdb54474b7a7cbe953f7869be41459650493e551) - URL: https://github.com/kamailio/kamailio/commit/c2fe99892cb69acec1e115a4f815dcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:03:19+01:00 core: str2int() test first if result is null, otherwise init it to 0 (cherry picked from commit b83a165e2d0e34c9bca742708c1891eb114bae04) (cherry picked from commit ac16e21715e57befcba386e74214fa482bdf97d7) (cherry picked from commit d86c831a474e57acc6bd744eb52a24b3b7b9a3c0) - URL: https://github.com/kamailio/kamailio/commit/7c1d6d348036eadf10a2e2b9f2254b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:03:36+01:00 xmlrpc: clean allocated buffer for reply when no more memory for reason value (cherry picked from commit 36a4b16117d79f1a30a9f929350f75ab8bfd5d2a) (cherry picked from commit aa875e297bea05828f319d71fc68c44969931231) (cherry picked from commit 1ccb215b96f3dc0bd49ea3feb00f9e8f1a5c1fda) - URL: https://github.com/kamailio/kamailio/commit/d61677b635b06b980396115d195d2ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:04:03+01:00 http_async_client: use enough size to print pointer as string in build_hash_key() - use local string variables instead of allocation in pkg, because the values are needed only inside the function - use safer snprintf() instead of sprintf() - GH #2091 (cherry picked from commit 087654a5028cd800e17fcd9d1768135a60fd6706) (cherry picked from commit 2ec8caa1ef9577fa4f21fb1fa2f9f6217a29f3eb) (cherry picked from commit c419dfddfbfc7b250a4be18665d4ed779435ac2e) - URL: https://github.com/kamailio/kamailio/commit/b2fcb29717143997c41b38a9ec53c68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:05:23+01:00 avp: free allocated variable in case of error (cherry picked from commit 5a18155c0fe661e7488f75afa7b0ea7638932943) (cherry picked from commit fc9ca0fcdff7ebc5399374038bc6a0aa02207229) (cherry picked from commit 9230834aec2de5a078c0a4a81f33bd5483729898) - URL: https://github.com/kamailio/kamailio/commit/2879e88b29b2063a95eaafbbaf30ebd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:05:41+01:00 tm: skip resuming suspended transactions put on wait - transaction is expired in that moment, pending its destroy process - GH #2055 (cherry picked from commit 52afc7b70f8e4abfb347c84872ab7daa202a6a24) (cherry picked from commit c44bd17c79bc0119ae201b826d84b9514700eda9) (cherry picked from commit f36d6562e54acc2b2f72c04a628b8e85f36bc9dd) - URL: https://github.com/kamailio/kamailio/commit/3cb40a54816228680db963d9d8f6344… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-01-28T09:08:19+01:00 core: add support for parsing http/2 replies parsing (cherry picked from commit 17be36102e3a1c286c69a5da193dd8405000ab62) (cherry picked from commit 18444d619b87c3734f3078f09c50a4fef1f8a259) - URL: https://github.com/kamailio/kamailio/commit/d6e63e224a2ce40034979e445e6fabf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:10:11+01:00 seas: docs - removed mi_fifo from examples (cherry picked from commit 31b710b5ec402bf75b3babe5ffe440c429d3ec63) (cherry picked from commit 7f66bb3beccdb9489388dec24be48d6a0e810876) - URL: https://github.com/kamailio/kamailio/commit/16d5fde46d5e8102557ee3e0841afdd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:10:27+01:00 tls: proper match of config profile by server id (cherry picked from commit 40f87b7e46714a114e7c98be7e677b20f1deb694) (cherry picked from commit 669266e775197760644c56be73a632db365f3d97) - URL: https://github.com/kamailio/kamailio/commit/f6c2f5a74bf14e00ba121550b5383dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:11:01+01:00 corex: declare nio specific globals in c file (cherry picked from commit 512f89bec0b6ebd2b3c7c16b115f15dbd6de9a39) (cherry picked from commit 045641ce82ba6150c72a3a25f967fea9a9e551f1) - URL: https://github.com/kamailio/kamailio/commit/431fa04f512d3eacd726d3e502b4382… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:11:32+01:00 core: more details on error log on failed comp_num() expression (cherry picked from commit a85bdf58e3f1933a4a1d231b5de4fd9cf1393366) (cherry picked from commit 2d6101227365f1f21b39ec4806b09f1c44df6348) - URL: https://github.com/kamailio/kamailio/commit/b7e933bfc230355988e268569724e46… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:11:45+01:00 auth_xkeys: proper debug log messages on valid match (cherry picked from commit 39802fd2efad4b710072244f360741312a7164f2) (cherry picked from commit a9df08d48297fbaf2690b5035314d8f4093ab315) - URL: https://github.com/kamailio/kamailio/commit/e4a02a70a973eb7c14f2c0848865167… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:11:59+01:00 core: kemi - handle notice log level in KSR.log() (cherry picked from commit 73088fd871b4b1a292c67e80c55373ed1b891144) (cherry picked from commit 765333402b2c012e0862d786202834e483f17cd6) - URL: https://github.com/kamailio/kamailio/commit/8d58e2e54ab24c9a4a17f20ca4ebe42… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:12:16+01:00 ipops: fix locating static index for dns pv - reported by GH #2179 (cherry picked from commit a383caa12a1af2cbc0f135add643045a159f24f2) (cherry picked from commit 732f2c04cbdbff537411118642c9f68340b66825) - URL: https://github.com/kamailio/kamailio/commit/2c34cb0d769f177fab9a8730553ce18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:12:57+01:00 tm: added missing $T(reply_reason) (cherry picked from commit bf57a7ab50949ddbeec787331548dfcb023c238f) (cherry picked from commit 7d2fab4d6c2c918c9636d5bcee74cb53f8475ea8) - URL: https://github.com/kamailio/kamailio/commit/95600a45c4ece0497f1664e38cf55dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:13:13+01:00 tls: docs - fix example for setting xavp_cfg (cherry picked from commit 4f42115ce29d446ad60b32af9ad370d9b2d847c2) (cherry picked from commit b1a6e5838e23716c19051eff89912ebc1410c69c) - URL: https://github.com/kamailio/kamailio/commit/19810561dcf77fa792b0e73b25d1e39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:13:24+01:00 tls: set default tls method (version) to 1+ - it was 1, but newer libssl doesn't have it anymore - while older systems don't have newer version support (cherry picked from commit 1da196174d8cd7e82ce57d4de60197fc063e6b50) (cherry picked from commit bd9fcd34420b6fef3e9f8838af7bfc73587626da) - URL: https://github.com/kamailio/kamailio/commit/664cdd3938efb66f6d031a0d990d1c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:13:42+01:00 core: check logging protection before the level (cherry picked from commit 53ca8b50207ca35f16a2315efb1ed29448961da8) (cherry picked from commit eb2f7ad9d50f9bdd7ad4c3688f0e04a9494d1e0c) - URL: https://github.com/kamailio/kamailio/commit/f5cb03e8da3c02982036afa1ad651ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:13:54+01:00 log_custom: send processing logs via udp (cherry picked from commit ec0dd71bd963d7bf5959521ff82b6a659efe699a) (cherry picked from commit fb952a9351071bedadb61e6ea030a031f6fec6e3) - URL: https://github.com/kamailio/kamailio/commit/fef069290dc93bd13754b000ba4db80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:14:37+01:00 tm: rework code to avoid compiler warnings - fix log message priting wrong string variable (cherry picked from commit 263b8ce5360716e44c6a7bcdbc65a76dfad67575) (cherry picked from commit 1d8f795c111c0fe5f5f992d137d0d94d49144fb6) - URL: https://github.com/kamailio/kamailio/commit/180ab2298e90bdc6d3a3407a14beeae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:15:49+01:00 core: make dst_uri null terminated (cherry picked from commit ca546d35c326666c6389c84ce45214bd2fc5c147) (cherry picked from commit 73be78ff3585e521e9b2102d7473db8b8ef13481) - URL: https://github.com/kamailio/kamailio/commit/4e75edbe0f4cfd5a7f10dcf98bb3085… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:16:12+01:00 ims_isc: null terminate dst_uri field (cherry picked from commit a8cc28b6e0236b21569625baffa865ff4ce0a153) (cherry picked from commit 29ca1231c624e79ded4d2cb633e7eeae77398d4a) - URL: https://github.com/kamailio/kamailio/commit/c7128983ace25979b19edb68e1a7c29… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-01-28T09:16:30+01:00 permissions: fix crash if load_backends parameter is 1 fixes #2151 (cherry picked from commit d7f4493da751802dc47a694d251d34a85a7b3bf1) (cherry picked from commit eae9d86fb1e579cb3a18577884f631014ad7b455) - URL: https://github.com/kamailio/kamailio/commit/64341357b800a7ec7ee48365bf6615b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:16:43+01:00 rtproxy: docs - fixed section id value (cherry picked from commit e896f2c9286809b5ef81c4952577780002ee5df8) (cherry picked from commit 0da0fee7d5cc7d3f07e5525b335d78f8a17e0a18) - URL: https://github.com/kamailio/kamailio/commit/0b7d450490a93eae2af785674297ca2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:16:55+01:00 kex: docs - fixed rpc command name for shm memory details (cherry picked from commit 9e89a66b36d7aa691cf69d5b33b7ee31330693e9) (cherry picked from commit c9b0ef608d2d6afe8b551057fed0ccb47b5fe985) - URL: https://github.com/kamailio/kamailio/commit/bcd8d554d138d8df611a9b11ee18a33… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:17:09+01:00 phonenum: use -std=c++11 cpp compile flag - required by the libphonenumber (cherry picked from commit 75c5a20a870985059f642ac1a6624655332dbca8) (cherry picked from commit 0614a74d44c98deffada7a8c61edfe7453da260f) - URL: https://github.com/kamailio/kamailio/commit/126a333fa758cd0b4947f465124dfe9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:17:30+01:00 uac: reset credentials structure for uac_req_send() authentication (cherry picked from commit 2b12754920704f49cd227c518e130cef4d76ea7d) (cherry picked from commit 2c00d15ddb48436827fba7d1d3a0c5ae3ec3e864) - URL: https://github.com/kamailio/kamailio/commit/077f33fcf0476316880c8e3b7027c7d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:17:58+01:00 rr: debug messages when record-route is inserted - some trailing whitespace removed (cherry picked from commit 027082793ccd4e849234e1dfa312c2148a8fd08d) (cherry picked from commit c4431b1932a73fec7c9e75418f451c3745bd7ad5) - URL: https://github.com/kamailio/kamailio/commit/cc73df39b316060f408f76fbf99bf3e… Author: Alex Balashov <abalashov(a)evaristesys.com> Date: 2020-01-28T09:18:17+01:00 evapi: Removed cast of bind port to short, as this restricted ports to signed 16-bit int values (< 32768). htons() takes unsigned 16-bit integer and returns the same. When this value was cast to (short), higher ports could not be used. (cherry picked from commit e9545ae1e490ff768270d03ea28f14b751d2c132) (cherry picked from commit 4935d3c3c9ff76f34670fe39e26df11f909d6453) - URL: https://github.com/kamailio/kamailio/commit/8785c8f7014eb34903acf2a2d54a620… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:18:38+01:00 core: qmalloc - print details of prev fragment when its tail is overwritten - do it when check2 field is not touched (cherry picked from commit bf1ba8d2d4519af50d44acfce5f34535fd1db8e0) (cherry picked from commit f7c990e2ca6c7b2d43cf15723c71ba38065236e8) - URL: https://github.com/kamailio/kamailio/commit/1c6d3704f79e1b27648d89abb847449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:18:59+01:00 acc: better evaluation of error return for pv_printf_s() (cherry picked from commit 69ccdc25fbfaf01785127ecb051429e51df6cad5) (cherry picked from commit 97627793db2963704202f252d45821d8c05acc1b) - URL: https://github.com/kamailio/kamailio/commit/5d7c22cc96ef8d29f77788bce1ddfa3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:19:47+01:00 app_sqlang: imported latest squirrel interpreter (cherry picked from commit b0fc60403b539672c6a2638083e8955783c65e0b) (cherry picked from commit 9bdcde18c932d81efd4d58a810b88e42d9fcdec8) - URL: https://github.com/kamailio/kamailio/commit/ede932b2086c93a2dc8bec003a1216d… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-28T09:19:58+01:00 app_sqlang: fix squirrel warning: ânArgsâ may be used uninitialized in this function (cherry picked from commit 7fad9c51f71854e0649fe76e273190e4b4f82438) (cherry picked from commit 0b6cde5604fcbc3756311b1ddacc4d7a230d7152) - URL: https://github.com/kamailio/kamailio/commit/a37ff12c7745f30b436e84fcf3974e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:20:18+01:00 evapi: use local allocated buffer to get data parameter for event relay - use system malloc given that the data can be passed from jsonrpcs, which uses system malloc as well - try to grow the internall buffer as needed based on estimated size of output for the data parameter (cherry picked from commit 63334e312d60a5d6a6470b0067c29db672d08c7c) (cherry picked from commit b1bb24d3639c2869f825dd692a9b1346d1bb30b5) - URL: https://github.com/kamailio/kamailio/commit/cefd208fc503ea31d0c0a33c8df5d13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:20:28+01:00 core: pad some fields in contained structs for 4 byte alignment - safety for sigbus on strict cpu architectures when accesing fields by address (cherry picked from commit 1296bb2270985a1bf3af04f35e4cdae1fe4b184a) (cherry picked from commit 3d6246d97385fbd3742c1d860b8f974a79f0ef8c) - URL: https://github.com/kamailio/kamailio/commit/13723ec030a7a73a0aab324b4961551… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:20:43+01:00 statsc: debug message when fetching stats values (cherry picked from commit a463c53e767114567ff25f0fe50115da0e3d0045) (cherry picked from commit a519a289cccf89a06bb7fa3857fef5505049a277) - URL: https://github.com/kamailio/kamailio/commit/dcecac9c05c9ffa67f01d02e52e2f8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:20:57+01:00 nathelper: removed exe flag from c file (cherry picked from commit 82195c2a51c5020ca0024f59492a4e2faef0e15a) (cherry picked from commit 2f0a0b785efc921cd82dee274b548516b1bb5d40) - URL: https://github.com/kamailio/kamailio/commit/b03c1819fa09129a2757ef4cfd7a93f… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-28T09:21:10+01:00 uri_db: spelling fix in variable name (cherry picked from commit 23b60ed9fbf9396bd531c76f57c133d5850c0764) (cherry picked from commit 0e552e6c2efcf449e91040b781eafafca2a1e97a) - URL: https://github.com/kamailio/kamailio/commit/913f1be3736a5988991b83ac2ed7324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:22:13+01:00 core: msg translator - warning log made info for multipart body processing - check boundary cannot find boundary value in content-type when the request is turned into multipart body - use different return code for this case - a few realignmets for curly braces to be corherent across the respective functions (cherry picked from commit 2c7ba53b2b6cc7dd5e3c24241d23e76fb052aa50) (cherry picked from commit 0a90aecb5737f4001cad7bb20590823deea4390e) (cherry picked from commit f9af11b1857a7bb63dbecee775b45c0ac57ca287) - URL: https://github.com/kamailio/kamailio/commit/82eac3c53275f7f56e106f13757429d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T09:22:26+01:00 permissions: safety checks when destroying module - avoid warning of freeing null pointers on failed startup (cherry picked from commit d98d8b653e5cf0ae358f6abac392ec44ee39548a) (cherry picked from commit aa57ad455b0c0f907bfc5f2f9a0fc382344b7bdb) (cherry picked from commit bad37f2dd4abd929d1603a836475e2baad61f4f9)

4 years, 11 months

git:5.3:0e366f12: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.3 Commit: 0e366f1237e96b4f7fce261dbf1522e85336a9ec URL: https://github.com/kamailio/kamailio/commit/0e366f1237e96b4f7fce261dbf1522e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-28T08:46:24+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/seas/README --- Diff: https://github.com/kamailio/kamailio/commit/0e366f1237e96b4f7fce261dbf1522e… Patch: https://github.com/kamailio/kamailio/commit/0e366f1237e96b4f7fce261dbf1522e… --- diff --git a/src/modules/seas/README b/src/modules/seas/README index 2a93361aa8..6acbd8accf 100644 --- a/src/modules/seas/README +++ b/src/modules/seas/README @@ -754,9 +754,7 @@ loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/seas.so" -loadmodule "/usr/local/lib/kamailio/modules/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("usrloc", "db_mode", 0) modparam("rr", "enable_full_lr", 1) modparam("seas", "listen_sockets", "127.0.0.1:5080"); @@ -820,9 +818,7 @@ mpath="/home/elias/src/sipservlet/seas" loadmodule "modules/tm/tm.so" loadmodule "modules/seas/seas.so" -loadmodule "modules/mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("seas", "listen_sockets","127.0.0.1:5080") route{

4 years, 11 months

git:5.2:bad37f2d: permissions: safety checks when destroying module

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: bad37f2dd4abd929d1603a836475e2baad61f4f9 URL: https://github.com/kamailio/kamailio/commit/bad37f2dd4abd929d1603a836475e2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:44:23+01:00 permissions: safety checks when destroying module - avoid warning of freeing null pointers on failed startup (cherry picked from commit d98d8b653e5cf0ae358f6abac392ec44ee39548a) (cherry picked from commit aa57ad455b0c0f907bfc5f2f9a0fc382344b7bdb) --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/bad37f2dd4abd929d1603a836475e2b… Patch: https://github.com/kamailio/kamailio/commit/bad37f2dd4abd929d1603a836475e2b… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 30637380d4..3abb5f370e 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -48,7 +48,7 @@ MODULE_VERSION static rule_file_t allow[MAX_RULE_FILES]; /* Parsed allow files */ static rule_file_t deny[MAX_RULE_FILES]; /* Parsed deny files */ -static int rules_num; /* Number of parsed allow/deny files */ +static int rules_num = 0; /* Number of parsed allow/deny files */ /* Module parameter variables */ @@ -664,11 +664,11 @@ static void mod_exit(void) int i; for(i = 0; i < rules_num; i++) { - free_rule(allow[i].rules); - pkg_free(allow[i].filename); + if(allow[i].rules) free_rule(allow[i].rules); + if(allow[i].filename) pkg_free(allow[i].filename); - free_rule(deny[i].rules); - pkg_free(deny[i].filename); + if(deny[i].rules) free_rule(deny[i].rules); + if(deny[i].filename) pkg_free(deny[i].filename); } clean_trusted();

4 years, 11 months

git:5.2:f9af11b1: core: msg translator - warning log made info for multipart body processing

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: f9af11b1857a7bb63dbecee775b45c0ac57ca287 URL: https://github.com/kamailio/kamailio/commit/f9af11b1857a7bb63dbecee775b45c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:44:09+01:00 core: msg translator - warning log made info for multipart body processing - check boundary cannot find boundary value in content-type when the request is turned into multipart body - use different return code for this case - a few realignmets for curly braces to be corherent across the respective functions (cherry picked from commit 2c7ba53b2b6cc7dd5e3c24241d23e76fb052aa50) (cherry picked from commit 0a90aecb5737f4001cad7bb20590823deea4390e) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/f9af11b1857a7bb63dbecee775b45c0… Patch: https://github.com/kamailio/kamailio/commit/f9af11b1857a7bb63dbecee775b45c0… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index ae92609965..9898f32622 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1711,16 +1711,14 @@ int get_boundary(struct sip_msg* msg, str* boundary) params.s = memchr(msg->content_type->body.s, ';', msg->content_type->body.len); - if (params.s == NULL) - { + if (params.s == NULL) { LM_INFO("Content-Type hdr has no boundary params <%.*s>\n", msg->content_type->body.len, msg->content_type->body.s); - return -1; + return -2; } params.len = msg->content_type->body.len - (params.s - msg->content_type->body.s); - if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) - { + if (parse_params(&params, CLASS_ANY, &hooks, &list) < 0) { LM_ERR("while parsing Content-Type params\n"); return -1; } @@ -1728,11 +1726,9 @@ int get_boundary(struct sip_msg* msg, str* boundary) boundary->len = 0; for (p = list; p; p = p->next) { if ((p->name.len == 8) - && (strncasecmp(p->name.s, "boundary", 8) == 0)) - { + && (strncasecmp(p->name.s, "boundary", 8) == 0)) { boundary->s = pkg_malloc(p->body.len + 2); - if (boundary->s == NULL) - { + if (boundary->s == NULL) { free_params(list); LM_ERR("no memory for boundary string\n"); return -1; @@ -1765,9 +1761,17 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) int t, ret, lb_size; char *pb; - if(!(msg->msg_flags&FL_BODY_MULTIPART)) return 0; - else - { + if(!(msg->msg_flags&FL_BODY_MULTIPART)) { + LM_DBG("no multi-part body\n"); + return 0; + } else { + if((t = get_boundary(msg, &ob)) != 0) { + if(t==-2) { + LM_INFO("no boundary - maybe just turning into multipart body\n"); + return -2; + } + return -1; + } buf.s = build_body(msg, (unsigned int *)&buf.len, &ret, send_info); if(ret) { LM_ERR("Can't get body\n"); @@ -1775,10 +1779,6 @@ int check_boundaries(struct sip_msg *msg, struct dest_info *send_info) } tmp.s = buf.s; t = tmp.len = buf.len; - if(get_boundary(msg, &ob)!=0) { - if(tmp.s) pkg_free(tmp.s); - return -1; - } if(str_append(&ob, &bsuffix, &b)!=0) { LM_ERR("Can't append suffix to boundary\n"); goto error; @@ -1962,6 +1962,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, unsigned int flags; unsigned int udp_mtu; struct dest_info di; + int ret; via_insert_param=0; uri_len=0; @@ -1979,9 +1980,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, path_buf.len=0; flags=msg->msg_flags|global_req_flags; - if(check_boundaries(msg, send_info)<0){ - LM_WARN("check_boundaries error\n"); + if((ret = check_boundaries(msg, send_info)) < 0){ + LM_INFO("check boundaries negative (%d)\n", ret); } + /* Calculate message body difference and adjust Content-Length */ body_delta = lumps_len(msg, msg->body_lumps, send_info); if (adjust_clen(msg, body_delta, send_info->proto) < 0) {

4 years, 11 months

git:5.3:aa57ad45: permissions: safety checks when destroying module

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: aa57ad455b0c0f907bfc5f2f9a0fc382344b7bdb URL: https://github.com/kamailio/kamailio/commit/aa57ad455b0c0f907bfc5f2f9a0fc38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:30:47+01:00 permissions: safety checks when destroying module - avoid warning of freeing null pointers on failed startup (cherry picked from commit d98d8b653e5cf0ae358f6abac392ec44ee39548a) --- Modified: src/modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/aa57ad455b0c0f907bfc5f2f9a0fc38… Patch: https://github.com/kamailio/kamailio/commit/aa57ad455b0c0f907bfc5f2f9a0fc38… --- diff --git a/src/modules/permissions/permissions.c b/src/modules/permissions/permissions.c index 2b2e508410..b69cf63922 100644 --- a/src/modules/permissions/permissions.c +++ b/src/modules/permissions/permissions.c @@ -48,7 +48,7 @@ MODULE_VERSION static rule_file_t allow[MAX_RULE_FILES]; /* Parsed allow files */ static rule_file_t deny[MAX_RULE_FILES]; /* Parsed deny files */ -static int rules_num; /* Number of parsed allow/deny files */ +static int rules_num = 0; /* Number of parsed allow/deny files */ /* Module parameter variables */ @@ -662,11 +662,11 @@ static void mod_exit(void) int i; for(i = 0; i < rules_num; i++) { - free_rule(allow[i].rules); - pkg_free(allow[i].filename); + if(allow[i].rules) free_rule(allow[i].rules); + if(allow[i].filename) pkg_free(allow[i].filename); - free_rule(deny[i].rules); - pkg_free(deny[i].filename); + if(deny[i].rules) free_rule(deny[i].rules); + if(deny[i].filename) pkg_free(deny[i].filename); } clean_trusted();

4 years, 11 months

git:5.3:9eb14a43: auth_xkeys: proper debug log messages on valid match

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.3 Commit: 9eb14a43fcd6b21e02b9b0e9f4283f37f0d81f37 URL: https://github.com/kamailio/kamailio/commit/9eb14a43fcd6b21e02b9b0e9f4283f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-28T08:30:08+01:00 auth_xkeys: proper debug log messages on valid match (cherry picked from commit 39802fd2efad4b710072244f360741312a7164f2) --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/9eb14a43fcd6b21e02b9b0e9f4283f3… Patch: https://github.com/kamailio/kamailio/commit/9eb14a43fcd6b21e02b9b0e9f4283f3… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 53b7325dff..6ce8f9d25c 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -352,7 +352,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha256(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha256 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha256 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; } @@ -364,7 +364,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha384(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha384 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha384 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; } @@ -376,7 +376,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha512(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha512 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha512 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; }

4 years, 11 months

← Newer
1
...
11
12
13
14
15
16
17
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020