sr-dev November 2016

sr-dev@lists.kamailio.org

27 participants
289 discussions

git:4.4:b1e3d396: rtjson: fix for replacing to header based on json document

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: b1e3d396bb8ef8989895d9017bc8a98a85ce307f URL: https://github.com/kamailio/kamailio/commit/b1e3d396bb8ef8989895d9017bc8a98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-30T07:42:09+01:00 rtjson: fix for replacing to header based on json document - reported by GH #868 (cherry picked from commit 1d5f39a23f1b92575153c5bb2ba87f15f80fa827) --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/b1e3d396bb8ef8989895d9017bc8a98… Patch: https://github.com/kamailio/kamailio/commit/b1e3d396bb8ef8989895d9017bc8a98… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 5542e63..60bdcad 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -481,7 +481,7 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) xuri.len = strlen(xuri.s); } if(xdsp.len>0 || xuri.len>0) { - uacb.replace_from(msg, &xdsp, &xuri); + uacb.replace_to(msg, &xdsp, &xuri); } } }

7 years, 12 months

git:master:1d5f39a2: rtjson: fix for replacing to header based on json document

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1d5f39a23f1b92575153c5bb2ba87f15f80fa827 URL: https://github.com/kamailio/kamailio/commit/1d5f39a23f1b92575153c5bb2ba87f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-30T07:41:11+01:00 rtjson: fix for replacing to header based on json document - reported by GH #868 --- Modified: modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/1d5f39a23f1b92575153c5bb2ba87f1… Patch: https://github.com/kamailio/kamailio/commit/1d5f39a23f1b92575153c5bb2ba87f1… --- diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 5542e63..60bdcad 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -481,7 +481,7 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) xuri.len = strlen(xuri.s); } if(xdsp.len>0 || xuri.len>0) { - uacb.replace_from(msg, &xdsp, &xuri); + uacb.replace_to(msg, &xdsp, &xuri); } } }

7 years, 12 months

[kamailio/kamailio] 4.4 (#867)

by dnadares

The rtjson module is modifying the "from" header twice and the "to" header keeps unchanged. `[root@dwrfsd01 kamailio]# git diff diff --git a/modules/rtjson/rtjson_routing.c b/modules/rtjson/rtjson_routing.c index 5542e63..60bdcad 100644 --- a/modules/rtjson/rtjson_routing.c +++ b/modules/rtjson/rtjson_routing.c @@ -481,7 +481,7 @@ int rtjson_prepare_branch(sip_msg_t *msg, srjson_doc_t *jdoc, srjson_t *nj) xuri.len = strlen(xuri.s); } if(xdsp.len>0 || xuri.len>0) { - uacb.replace_from(msg, &xdsp, &xuri); + uacb.replace_to(msg, &xdsp, &xuri); } } } ` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/867 -- Commit Summary -- * pkg/rpm: update spec files for v4.4.2 * pkg/kamailio: version updates in some spec files * Makefile.defs: version set to 4.4.2 * ChangeLog: content updated for v4.4.2 * dmq Correct README * modules: readme files regenerated - dmq ... * topos: note in docs that masking callid is not implemented yet * db_unixodbc: detect DB disconnection with generic HY000 status * core: fix Sun Studio build * counters: fix return statement in void function * dialog: remove return statement from void functions * ctl: remove return statement from void function * uid_avp_db: remove GCC specific -Wall * core: ensure cfg_block structure is 8 byte aligned * modules: readme files regenerated - topos ... * userblacklist: fix typo on evaluating the table parameter * userblacklist: more debug info when failing to do the query * userblacklist: fixed copy-paste typo when evaluating table parameter * rr: fix spelling errors catched by lintian #688 * rr: refactored the check route params to detect properly if same message is used * dialog: open db connection from rpc processes * tm: check branch uri against current uri when deciding if append a new branch * rtpengine: init rtp engine sockets array after allocation * rtpproxy: init rtpproxy sockets array after allocation * tm: execut cfg_update() inside t_continue() * janssonrpc-c: init cfg framework for additional process * kazoo: init cfg framework in child processes * http_async_client: don't stop routing script execution for a POST query if transaction is not suspended * http_async_client: init PV API sooner * Makefile.rules: exclude test folder from tags generation paths * core: structure to pass cfg env attributes between components * dialog: pass info on cseq update tracking via cfg environment * uac: add cookie header for cseq tracking * core: helper functions for header management with strz values * dialog: use cookie header to detect cseq auth increment needs * db_mongodb: fix warning for bool comparison * pv: return 5061 for port variables (e.g., $dp) when transport is tls * rtpproxy: comment about child init rank filtering * core: fix regex error for modules parameters * modules/ipops: fix subnet matching for mask /0 * tls: test if ssl crypto locking callback is already set * core/mem: qm - test and print status for chunks start/end markers for mem status * core: mem - qm: coherent indentation and whitespacing * core: mem_status_all - added to cfg core structure * core: mem/qm - test cfg core mem_status_all to print memory status * core: fix offset to in hdr add helper added recently * dialog: buffer-based remove of custome header tracking cseq updates * core: added mem_status_mode parameter * dialog: parse all headers to check if cseq increment is needed * avpops: note that avp_copy() is reversing the order of the values * core: helper functions to add headers with str parameters * core: srapi - cseq update field update to be a function * core: add header helper uses after lump anchor insert * uac: use cseq update callback exported by dialog via core srapi * dialog: cseq update callback implemented inside the module * tm: wrap uri values in brackets inside error messages * tls: more detailed log message when tls module cannot set libssl memory manager * tls: coherent whitespacing and indentation * tls: added note in docs about loading tls module first * tls: print ssl memory functions if they cannot be set * topos: skip options from contact header check * presence: fix potential double free in shutdown routine * presence: Always check if a record exists for this dialog before inserting * core: parse rr - removed function name from logs * core: print content when failing to parse rr body * presence: fix memory leak introduced by last commit * registrar: Add warnings if contact is invalid and REGISTER will be rejected * registrar: Check max URI size of contact also for first contact header * presence: log when presentity is deleted due to already existing * presentity: don't update terminated presentity entries in the database * uac: uac_reg: fix uac_reg_get_byuser() * http_async_client: fixed small typo in docs * core: msg_parser log output adaptations * dialog: jump to error if fails to parse requests in cseq update callback * tm: Set tcx.branch_index to picked branch before running failure route. * rtimer: Validate mode parameter * dispatcher: free memory on shutdown * pv: xavp: log error message when memory allocation fails * core: Enable SIGUSR1 for child processes * mqueu: Convert items to single linked list * tmx: Try to get branch_index for all replies * jsonrpc_s: Return an error when JSON parsing fails * core: Don't bind to IPv6 addresses if auto_bind_ipv6 is disabled * topos: skip comma at the end when reinserting rr headers * sl: Reset timeout before sending the message * presence: fix crash when field value is null * dialog: set DLG_FLAG_CHANGED for changed dialog variables * topos: force checking of Contact header for INVITE only * core: fix some logging in tcp_read.c * outbound: use pkg-config for libcrypto in makefile * presence: fix multiple double free on shutdown caught with memlog=1 * core: fix double free on clearing hdr * core: fix double free on clearing lump * core: parser - safety check and clean log messages for disposition header * dialog: refresh cseq update if it was incremented in the past * topos: record routing storage for handling sip responses * dialog: proper safety test if cseq value in via is larger than hdr * dialog: proper refresh of cseq for requests withing dialog after an increment * core: handle return code for tcp read headers/ws before printing extra debug logs * core: tcp read - proper safety when priting log messages for read error case * topos: error message about missing uuid when loading dlg made dbg * path: added section ids in docs * topos: store record route set only for initial 200ok response * jansson: test if pkg-config knows about jansson library * dialog: ensure all headers are parsed to find the custom ones for cseq refresh * topos: more appropriate error log when attepting to delete header * tcpops: add documentation for tcp:closed * core: macro helper to trim zeros from str value * topos: trim values before reinserting the route header * topos: proper check if the last char in headr value is eol * http_client: added semicolons in the examples * core: try to catch dash immediately after ID in define/ifdef * uac: updated the docs for uac registration refresh rpc command * mohqueue: prevent calls sticking in queue * utils Add missing semi-colons to documentation * modules: readme files regenerated - avpops ... * evapi: fixed the communication with dispatcher after initializing it as rpc worker * jsonrpc-c: set the cpm pipe for all child processes * janssonrpc-c: set the cmd pipe for all child processes * db_mongodb: elaborated the docs for usage with tls module * ndb_mongodb: elaborated the docs for usage with tls module * modules: readme files regenerated - db_mongodb ... * pkg/rpm: spec files updated for v4.4.3 * textops: more details for set_body_multipart() and need of msg_apply_changes() * modules: readme files regenerated - textops ... * pkg/kamailio/deb: set version to 4.4.3 * Makefile.defs: version set to 4.4.3 * ChangeLog: content updated for v4.4.3 * presence: test if event is dialog for checking terminated state in presentity update * presence: free db result when get_dialog_state() retrieves no rows * presence: Fix memory leak in DB code * pkg/kamailio/deb: add Ubuntu Xenial support * presence: fix crash when no dialog.id on dialog-info xml * dispatcher: proper selection of the gateway when the maxload is 0 * http_client Terminate exported commands list * dialog: wrapper defines for ref/unref operations to get file name and line * dialog: no need to release the dialog when refreshing cseq * core: allow '_' in event route name * presence: expire value kept and printed in logs as unsigned int * core: fixed misleading indentation for return statement * core: proper code block when saving chosen naptr record * core: ut - fix misleading indentation for IF blocks * auth_identity: fix misleading indentation level * counters: fixed rpc command to get counter by group and name * utils: coherent indentation for xcap functions * core: rely on msg->last_header to get the anchor inside sr_hdr_add() * core: print sip message on error related to missing body * websocket: handle CRLF received inside a frame (as SIP layer ping) * presence: fix crush if dialog id is NULL * core: defined macro for CRLFCRLF * websocket: catch CRLFCRLF pings over websocket connections * tmx: fix condition for private copy of the message * modules/tmx: fix mi command t_uac_cancel * auth_identity: switched to use pointer of X509_STORE_CTX * auth_identity: still use ASN1_STRING_data() for libssl < v1.1.0 * crypto: updated to be compatible with api from libssl v1.1.0 * tls: updates for compatibilty with libssl v1.1.0 api * tls: updated bio functions to support libssl v1.1.0 api * core: parser - removed level and function prefix from log messages for identity info * tm: fixed misleading indentation of block after an IF (reported by gcc 6.2) * pv: adjusted indentation after if blocks to avoid gcc 6.2 warnings * ldap: removed unused variable * db_perlvdb: fixed warning of using static function inside inline one * presence: remove unused variable * pua_xmpp: fixed misleading missing guard for if block * purple: Fix multiple memory leaks in DB code * core: print the len for added header in debug message * core: msg parser - relocated static inline functions from header file * core: msg parser - more log message for get body function * ctl: split the definition of default ctl socket * ctl: take in consideration runtime_dir when creation the ctl socket * Makefile.defs: option to disable raw sockets at compile time * Presence: Fix startup inconsistency in presentity hash table * dialog: propre reparse of msg structure when doing cseq refresh ops * janssonrpc-c: fix memory leak when using janssonrpc_notification * mem: TLSF bit ops cleanup / 64 bits improvement * pv: Use memcpy to copy len bytes instead of strcpy * rr: more log details when 2nd rr with r2=on is not matching a local socket * rr: fixed typo in log message * permissions: update doc with missing MI and RPC commands: * rr: use default port for protocol if it is omitted in route header * lib/srdb1: fix the memset to 0 in util function * db_postgres: safety check of str buffer pointer before writing * htable: earlier init of jdoc used for dmq for proper clean on error cases * pua: copy over subs flag in subscribe_cbparam() * pua: one more proper propagation of ua_flags in subs_cbparam_indlg() * pua: fix propagation of ua_flag - it is func param, not in subs * core: parser - use square brakets for log messages of addr-spec parsing * core: parse addr spec - removed old style log message prefixes * permissions: doc typo fixed * uac: coherent indentation of code for replace from/to values * uac: safety check for new uri to include only printable characters * ndb_redis: get the srv structure after checking parameter sanity * lib/srutils: removed valueint field from json struct * dialog: converted to use json helper macros for dlg profile * dmq_usrloc: use usigned int for contact info values * htable: switched to json macros for numbers in dmq operations * rtjson: use json macros to retrieve int values * jsonrpc-s: switched to use json helper macros for numbers * lib/srutils: srjson - init number value for null, true and false * modules/nathelper: fix small typo in documentation * modules/sanity: fix small typo in documentation * modules/dispatcher: fix small typo in documentation * modules/crypto: fix small typo in documentation * domain: fixed typo in the log message * mi_datagram: safety check so the length of mi socket doesn't result in overflow * core: parser/sdp - init pf variable to avoid compile time warnings * rr: removed unused assignment * janssonrpc-c: declare variables at beginning of netstring_read_fd() * core: parser/parse_diversion - allow comma separated bodies * modules: readme files regenerated - crypto ... * xmpp: shift head of connection list when first is closed * jansson: init structure to avoid compile warnings * presence: free cloned dialog_id in case of errors * auth_identity: safer condition not to overflow building date header * statsd: increase buffer for miliseconds printing as function uses 21 size * statsd: free srv variable in error handling * statsd: one more increase for milliseconds buffer * rtpengine: free addrinfo in case of unknown address family * dialog: secure space in case \r\n needs to be added after extra headers * janssonrpc-c: fix shared memory leak on notification requests * app_python: dname is always allocated in system memory * core: init structure to 0 for pass fd operations * mi_fifo: close reply stream in case of continuing due to no response * ratelimit: close file pointer in case of scan error * janssonrpc-c: fix double free introduced by * debugger: re-order loop condition to avoid out of bounds access * ctl: proper trim for long error messages to avoid out of bounds access * mi_fifo: close fifo stream in case of errors * mi_rpc: init structures to avoid access to invalid content in case of errors * rtpengine: init all struct to get rid of compile warnings * lib/binrpc: memset addr variable to avoind uninitialized fields * auth_ephemeral: re-ordered code so access to sip msg is done after NULL check * app_lua: safety check of returned anchor before using it * tm: print warn messages when failing to update r-uri and path * usrloc: handle return code when registering the timer routine * corex: handle return code for ftell * pv: pv_var_to_xavp() - proper test for type int of script var * pv: return false if pv_unset() fails * textops: handle return code for parse_headers() * pkg/kamailio/deb: version set to 4.4.4 * pkg: version set to 4.4.4 in rpm specs * Makefile.defs: version set to 4.4.4 * ChangeLog: content updated for v4.4.4 * dispatcher: updates to sameple config file * dispatcher: docs - removed extra spaces and rephrased sample config text * modules: readme files regenerated - dispatcher ... * pua_dialoginfo: safety check of paramters for __dialog_sendpublish() * lib/srdb1: schema - don't set default value for text/blob columns of topos * kamctl: regenerated database schema -- File Changes -- M .travis.yml (2) M ChangeLog (18577) M INSTALL (116) M Makefile.defs (351) M Makefile.radius (7) M Makefile.rules (8) M README (32) M README.md (4) M action.c (4) M atomic/atomic_sparc64.h (3) M cfg.lex (20) M cfg.y (3) M cfg/cfg_struct.h (1) M cfg_core.c (3) M cfg_core.h (1) M config.h (5) M data_lump.c (120) M data_lump.h (7) M data_lump_rpl.c (5) M docbook/entities.xml (2) M dprint.h (112) M io_wait.h (4) M ip_addr.h (1) M lib/binrpc/binrpc_api.c (25) M lib/kcore/radius.h (11) M lib/srdb1/db_ut.c (59) M lib/srdb1/db_ut.h (7) M lib/srdb1/schema/location.xml (1) M lib/srdb1/schema/topos_d.xml (63) M lib/srdb1/schema/topos_t.xml (118) M lib/srutils/sha256.c (6) M lib/srutils/srjson.c (11) M lib/srutils/srjson.h (9) M lib/trie/dtrie.c (8) M main.c (23) M mem/f_malloc.c (93) M mem/f_malloc.h (8) M mem/memapi.h (22) M mem/pkg.c (4) M mem/pkg.h (20) M mem/q_malloc.c (202) M mem/q_malloc.h (8) M mem/shm.c (4) M mem/shm.h (4) M mem/tlsf_malloc.c (24) M mem/tlsf_malloc.h (2) M mem/tlsf_malloc_bits.h (85) M modparam.c (10) M modules/acc/README (138) M modules/acc/acc.c (14) M modules/acc_radius/README (36) M modules/acc_radius/acc_radius_mod.c (2) M modules/acc_radius/acc_radius_mod.h (4) M modules/acc_radius/doc/acc_radius_admin.xml (71) M modules/alias_db/README (22) M modules/app_java/Makefile (8) M modules/app_java/README (16) M modules/app_java/java_msgobj.c (2) M modules/app_lua/README (20) M modules/app_lua/app_lua_sr.c (6) M modules/app_mono/README (8) M modules/app_perl/README (106) M modules/app_perl/lib/perl/Kamailio/LDAPUtils/LDAPConnection.pm (3) M modules/app_perl/lib/perl/Kamailio/VDB.pm (7) M modules/app_python/README (10) M modules/app_python/mod_Core.c (14) M modules/app_python/mod_Logger.c (188) M modules/app_python/mod_Ranks.c (38) M modules/app_python/mod_Router.c (16) M modules/app_python/python_iface.c (12) M modules/app_python/python_mod.c (616) M modules/app_python/python_msgobj.c (758) M modules/app_python/python_support.c (364) M modules/async/README (10) M modules/async/doc/async.xml (11) M modules/async/doc/async_admin.xml (2) M modules/auth/README (22) M modules/auth/api.c (80) M modules/auth/api.h (30) M modules/auth/auth_mod.c (352) M modules/auth/auth_mod.h (4) M modules/auth/challenge.c (192) M modules/auth/challenge.h (18) M modules/auth/nc.c (33) M modules/auth/nc.h (18) M modules/auth/nid.c (19) M modules/auth/nid.h (14) M modules/auth/nonce.c (242) M modules/auth/nonce.h (34) M modules/auth/ot_nonce.c (29) M modules/auth/ot_nonce.h (18) M modules/auth/rfc2617.c (50) M modules/auth/rfc2617.h (77) M modules/auth_db/README (48) M modules/auth_diameter/README (20) M modules/auth_ephemeral/authorize.c (10) M modules/auth_identity/README (177) M modules/auth_identity/auth_crypt.c (26) M modules/auth_identity/auth_hdrs.c (22) M modules/auth_radius/README (69) M modules/auth_radius/authorize.c (2) M modules/auth_radius/doc/auth_radius_admin.xml (22) M modules/auth_xkeys/README (6) M modules/auth_xkeys/auth_xkeys.c (2) M modules/avp/README (2) M modules/avpops/README (53) M modules/avpops/doc/avpops_admin.xml (8) M modules/benchmark/README (24) M modules/blst/README (89) M modules/call_control/README (16) M modules/call_control/call_control.c (2) M modules/carrierroute/README (112) M modules/cdp/README (63) M modules/cdp/peermanager.c (2) M modules/cdp/peerstatemachine.c (2) M modules/cdp/peerstatemachine.h (2) M modules/cdp/session.c (9) M modules/cdp_avp/README (38) M modules/cfg_db/README (2) M modules/cfg_rpc/README (4) M modules/cfgutils/README (12) M modules/cfgutils/cfgutils.c (31) M modules/cfgutils/doc/cfgutils_admin.xml (13) M modules/cnxcc/Makefile (42) M modules/cnxcc/cnxcc_check.c (1) M modules/cnxcc/cnxcc_mod.c (74) M modules/corex/README (38) M modules/corex/corex_mod.c (4) M modules/corex/doc/corex_admin.xml (30) M modules/counters/README (61) M modules/counters/counters.c (34) M modules/cpl-c/README (32) M modules/crypto/README (8) M modules/crypto/crypto_mod.c (77) M modules/crypto/doc/crypto_admin.xml (2) M modules/ctl/README (2) M modules/ctl/binrpc_run.c (4) M modules/ctl/ctl.c (19) M modules/ctl/ctl_defaults.h (10) M modules/ctl/init_socks.c (2) M modules/db2_ldap/README (93) M modules/db2_ldap/ld_fld.c (1) M modules/db2_ops/README (271) M modules/db_berkeley/km_db_berkeley.c (3) M modules/db_cluster/README (2) M modules/db_flatstore/README (2) M modules/db_mongodb/README (10) M modules/db_mongodb/doc/db_mongodb_admin.xml (9) M modules/db_mongodb/mongodb_dbase.c (2) M modules/db_mysql/README (34) M modules/db_mysql/my_cmd.c (1) M modules/db_perlvdb/perlvdbfunc.c (2) M modules/db_postgres/pg_fld.c (22) M modules/db_postgres/pg_sql.c (12) M modules/db_sqlite/README (6) M modules/db_text/README (14) M modules/db_unixodbc/dbase.c (7) M modules/debugger/README (211) M modules/debugger/debugger_json.c (2) M modules/dialog/README (1136) M modules/dialog/dialog.c (11) M modules/dialog/dlg_cseq.c (291) M modules/dialog/dlg_cseq.h (5) M modules/dialog/dlg_db_handler.c (4) M modules/dialog/dlg_handlers.c (31) M modules/dialog/dlg_hash.c (15) M modules/dialog/dlg_hash.h (9) M modules/dialog/dlg_profile.c (4) M modules/dialog/dlg_req_within.c (2) M modules/dialog/dlg_var.c (6) M modules/dialog/doc/dialog_admin.xml (40) M modules/dialplan/README (44) M modules/dispatcher/README (416) M modules/dispatcher/dispatch.c (31) M modules/dispatcher/dispatcher.c (7) M modules/dispatcher/doc/dispatcher.cfg (64) M modules/dispatcher/doc/dispatcher_admin.xml (58) M modules/diversion/README (6) M modules/dmq/README (2) M modules/dmq/doc/dmq_admin.xml (2) M modules/dmq_usrloc/README (2) M modules/dmq_usrloc/usrloc_sync.c (24) M modules/dnssec/README (0) I modules/domain/README (0) I modules/domain/domain_mod.c (0) I modules/domainpolicy/README (0) I modules/drouting/README (0) I modules/enum/README (0) I modules/enum/enum.c (0) I modules/erlang/cnode.c (0) I modules/erlang/epmd.c (0) I modules/erlang/epmd.h (0) I modules/erlang/erl_api.c (0) I modules/erlang/erl_helpers.c (0) I modules/erlang/erl_helpers.h (0) I modules/erlang/handle_emsg.c (0) I modules/erlang/handle_emsg.h (0) I modules/erlang/mod_erlang.c (0) I modules/erlang/mod_erlang.h (0) I modules/erlang/worker.c (0) I modules/evapi/README (0) I modules/evapi/doc/evapi_admin.xml (0) I modules/evapi/evapi_dispatch.c (0) I modules/evapi/evapi_mod.c (0) I modules/exec/README (0) I modules/geoip2/geoip2_pv.c (0) I modules/group/README (0) I modules/gzcompress/README (0) I modules/htable/README (0) I modules/htable/api.c (0) I modules/htable/doc/htable_admin.xml (0) I modules/htable/ht_api.c (0) I modules/htable/ht_db.c (0) I modules/htable/ht_dmq.c (0) I modules/htable/ht_var.c (0) I modules/htable/htable.c (0) I modules/http_async_client/Makefile (0) I modules/http_async_client/README (0) I modules/http_async_client/async_http.c (0) I modules/http_async_client/doc/http_async_client_admin.xml (0) I modules/http_async_client/http_async_client_mod.c (0) I modules/http_client/README (0) I modules/http_client/curlcon.c (0) I modules/http_client/doc/http_client_admin.xml (0) I modules/http_client/functions.c (0) I modules/http_client/http_client.c (0) I modules/http_client/http_client.h (0) I modules/imc/README (0) I modules/imc/imc_mng.c (0) I modules/ims_auth/README (0) I modules/ims_charging/README (0) I modules/ims_dialog/README (0) I modules/ims_dialog/dlg_hash.c (0) I modules/ims_icscf/README (0) I modules/ims_isc/README (0) I modules/ims_qos/README (0) I modules/ims_registrar_pcscf/save.c (0) I modules/ims_registrar_pcscf/service_routes.c (0) I modules/ims_registrar_scscf/README (0) I modules/ims_usrloc_pcscf/README (0) I modules/ims_usrloc_scscf/impurecord.c (0) I modules/ipops/README (0) I modules/ipops/ipops_mod.c (0) I modules/iptrtpproxy/README (0) I modules/jansson/Makefile (0) I modules/jansson/README (0) I modules/jansson/doc/jansson.xml (0) I modules/jansson/doc/jansson_admin.xml (0) I modules/jansson/jansson_funcs.c (0) I modules/jansson/jansson_utils.c (0) I modules/janssonrpc-c/README (0) I modules/janssonrpc-c/janssonrpc_io.c (0) I modules/janssonrpc-c/janssonrpc_mod.c (0) I modules/janssonrpc-c/netstring.c (0) I modules/json/README (0) I modules/json/json_funcs.c (0) I modules/jsonrpc-c/README (0) I modules/jsonrpc-c/jsonrpc.c (0) I modules/jsonrpc-c/jsonrpc_mod.c (0) I modules/jsonrpc-s/README (0) I modules/jsonrpc-s/jsonrpc-s_mod.c (0) I modules/kazoo/README (0) I modules/kazoo/doc/kazoo_admin.xml (0) I modules/kazoo/kazoo.c (0) I modules/kex/README (0) I modules/kex/doc/kex_admin.xml (0) I modules/ldap/README (0) I modules/ldap/ldap_escape.c (0) I modules/log_custom/README (0) I modules/log_custom/log_custom_mod.c (0) I modules/malloc_test/README (0) I modules/mangler/README (0) I modules/matrix/README (0) I modules/maxfwd/README (0) I modules/mediaproxy/mediaproxy.c (0) I modules/mi_datagram/README (0) I modules/mi_datagram/mi_datagram.c (0) I modules/mi_fifo/README (0) I modules/mi_fifo/fifo_fnc.c (0) I modules/mi_rpc/README (0) I modules/mi_rpc/mi_rpc_mod.c (0) I modules/mi_xmlrpc/README (0) I modules/misc_radius/README (0) I modules/misc_radius/doc/misc_radius_admin.xml (0) I modules/misc_radius/functions.c (0) I modules/mohqueue/README (0) I modules/mohqueue/mohq.c (0) I modules/mohqueue/mohq.h (0) I modules/mohqueue/mohq_funcs.c (0) I modules/mqueue/README (0) I modules/mqueue/mqueue_api.c (0) I modules/msilo/README (0) I modules/msilo/doc/msilo.cfg (0) I modules/msilo/doc/msilo_admin.xml (0) I modules/msrp/README (0) I modules/mtree/README (0) I modules/nat_traversal/README (0) I modules/nat_traversal/nat_traversal.c (0) I modules/nathelper/README (0) I modules/nathelper/doc/nathelper_admin.xml (0) I modules/nathelper/sip_pinger.h (0) -- Patch Links -- https://github.com/kamailio/kamailio/pull/867.patch https://github.com/kamailio/kamailio/pull/867.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/867

7 years, 12 months

git:master:c21148d5: Merge pull request #866 from kamailio/nsq-add-dblock-param

by GitHub

Module: kamailio Branch: master Commit: c21148d5d2ce2e870c0de36ef5f4a18fbe60b816 URL: https://github.com/kamailio/kamailio/commit/c21148d5d2ce2e870c0de36ef5f4a18… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2016-11-29T09:44:06-05:00 Merge pull request #866 from kamailio/nsq-add-dblock-param nsq: add db_table_lock_type --- Modified: modules/nsq/doc/nsq_admin.xml Modified: modules/nsq/nsq_mod.c Modified: modules/nsq/nsq_mod.h Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/c21148d5d2ce2e870c0de36ef5f4a18… Patch: https://github.com/kamailio/kamailio/commit/c21148d5d2ce2e870c0de36ef5f4a18… --- diff --git a/modules/nsq/doc/nsq_admin.xml b/modules/nsq/doc/nsq_admin.xml index 6a1c90f..57fede6 100644 --- a/modules/nsq/doc/nsq_admin.xml +++ b/modules/nsq/doc/nsq_admin.xml @@ -441,6 +441,25 @@ modparam("nsq", "presentity_table", "my_presentity_table") </example> </section> + <section> + <title><varname>db_table_lock_type</varname>(int)</title> + <para> + Enable (=1) or disable (=0) the locks for table during a + transaction. + </para> + <para> + <emphasis>Default value is <quote>1</quote>.</emphasis> + </para> + <example> + <title>Set <varname>db_table_lock_type</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("nsq", "db_table_lock_type", 0) +... +</programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/modules/nsq/nsq_mod.c b/modules/nsq/nsq_mod.c index 3dd4b08..61d6334 100644 --- a/modules/nsq/nsq_mod.c +++ b/modules/nsq/nsq_mod.c @@ -65,6 +65,7 @@ static param_export_t params[]= {"db_url", PARAM_STR, &nsq_db_url}, {"pua_mode", INT_PARAM, &dbn_pua_mode}, {"json_escape_char", PARAM_STR, &nsq_json_escape_str}, + {"db_table_lock_type", INT_PARAM, &db_table_lock_type}, { 0, 0, 0 } }; @@ -191,6 +192,10 @@ static int mod_init(void) return -1; } + if (db_table_lock_type != 1) { + db_table_lock = DB_LOCKING_NONE; + } + nsq_pa_dbf.close(nsq_pa_db); nsq_pa_db = NULL; } diff --git a/modules/nsq/nsq_mod.h b/modules/nsq/nsq_mod.h index cd904dd..d86ac36 100644 --- a/modules/nsq/nsq_mod.h +++ b/modules/nsq/nsq_mod.h @@ -87,6 +87,8 @@ db1_con_t *nsq_pa_db = NULL; db_func_t nsq_pa_dbf; str nsq_presentity_table = str_init(PRESENTITY_TABLE); str nsq_db_url = {NULL, 0}; +int db_table_lock_type = 1; +db_locking_t db_table_lock = DB_LOCKING_WRITE; static int mod_init(void); static int mod_child_init(int); diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index b5ff38f..badb8cf 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -37,6 +37,7 @@ extern db1_con_t *nsq_pa_db; extern db_func_t nsq_pa_dbf; +extern db_locking_t db_table_lock; extern str nsq_presentity_table; extern str nsq_db_url; @@ -152,7 +153,7 @@ int nsq_pua_update_presentity(str* event, str* realm, str* user, str* etag, str* } if (nsq_pa_dbf.start_transaction) { - if (nsq_pa_dbf.start_transaction(nsq_pa_db, DB_LOCKING_WRITE) < 0) { + if (nsq_pa_dbf.start_transaction(nsq_pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; }

7 years, 12 months

git:master:17fadef3: nsq: add db_table_lock_type

by Emmanuel Schmidbauer

Module: kamailio Branch: master Commit: 17fadef3127901a08daf115fb350c2e59b1fd485 URL: https://github.com/kamailio/kamailio/commit/17fadef3127901a08daf115fb350c2e… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2016-11-29T09:10:45-05:00 nsq: add db_table_lock_type --- Modified: modules/nsq/doc/nsq_admin.xml Modified: modules/nsq/nsq_mod.c Modified: modules/nsq/nsq_mod.h Modified: modules/nsq/nsq_pua.c --- Diff: https://github.com/kamailio/kamailio/commit/17fadef3127901a08daf115fb350c2e… Patch: https://github.com/kamailio/kamailio/commit/17fadef3127901a08daf115fb350c2e… --- diff --git a/modules/nsq/doc/nsq_admin.xml b/modules/nsq/doc/nsq_admin.xml index 6a1c90f..57fede6 100644 --- a/modules/nsq/doc/nsq_admin.xml +++ b/modules/nsq/doc/nsq_admin.xml @@ -441,6 +441,25 @@ modparam("nsq", "presentity_table", "my_presentity_table") </example> </section> + <section> + <title><varname>db_table_lock_type</varname>(int)</title> + <para> + Enable (=1) or disable (=0) the locks for table during a + transaction. + </para> + <para> + <emphasis>Default value is <quote>1</quote>.</emphasis> + </para> + <example> + <title>Set <varname>db_table_lock_type</varname> parameter</title> +<programlisting format="linespecific"> +... +modparam("nsq", "db_table_lock_type", 0) +... +</programlisting> + </example> + </section> + </section> <section> <title>Functions</title> diff --git a/modules/nsq/nsq_mod.c b/modules/nsq/nsq_mod.c index 3dd4b08..61d6334 100644 --- a/modules/nsq/nsq_mod.c +++ b/modules/nsq/nsq_mod.c @@ -65,6 +65,7 @@ static param_export_t params[]= {"db_url", PARAM_STR, &nsq_db_url}, {"pua_mode", INT_PARAM, &dbn_pua_mode}, {"json_escape_char", PARAM_STR, &nsq_json_escape_str}, + {"db_table_lock_type", INT_PARAM, &db_table_lock_type}, { 0, 0, 0 } }; @@ -191,6 +192,10 @@ static int mod_init(void) return -1; } + if (db_table_lock_type != 1) { + db_table_lock = DB_LOCKING_NONE; + } + nsq_pa_dbf.close(nsq_pa_db); nsq_pa_db = NULL; } diff --git a/modules/nsq/nsq_mod.h b/modules/nsq/nsq_mod.h index cd904dd..d86ac36 100644 --- a/modules/nsq/nsq_mod.h +++ b/modules/nsq/nsq_mod.h @@ -87,6 +87,8 @@ db1_con_t *nsq_pa_db = NULL; db_func_t nsq_pa_dbf; str nsq_presentity_table = str_init(PRESENTITY_TABLE); str nsq_db_url = {NULL, 0}; +int db_table_lock_type = 1; +db_locking_t db_table_lock = DB_LOCKING_WRITE; static int mod_init(void); static int mod_child_init(int); diff --git a/modules/nsq/nsq_pua.c b/modules/nsq/nsq_pua.c index b5ff38f..badb8cf 100644 --- a/modules/nsq/nsq_pua.c +++ b/modules/nsq/nsq_pua.c @@ -37,6 +37,7 @@ extern db1_con_t *nsq_pa_db; extern db_func_t nsq_pa_dbf; +extern db_locking_t db_table_lock; extern str nsq_presentity_table; extern str nsq_db_url; @@ -152,7 +153,7 @@ int nsq_pua_update_presentity(str* event, str* realm, str* user, str* etag, str* } if (nsq_pa_dbf.start_transaction) { - if (nsq_pa_dbf.start_transaction(nsq_pa_db, DB_LOCKING_WRITE) < 0) { + if (nsq_pa_dbf.start_transaction(nsq_pa_db, db_table_lock) < 0) { LM_ERR("in start_transaction\n"); goto error; }

7 years, 12 months

[kamailio/kamailio] nsq: add db_table_lock_type (#866)

by Emmanuel Schmidbauer

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/866 -- Commit Summary -- * nsq: add db_table_lock_type -- File Changes -- M modules/nsq/doc/nsq_admin.xml (19) M modules/nsq/nsq_mod.c (5) M modules/nsq/nsq_mod.h (2) M modules/nsq/nsq_pua.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/866.patch https://github.com/kamailio/kamailio/pull/866.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/866

7 years, 12 months

git:4.4:91dcaafc: kamctl: regenerated database schema

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 91dcaafcc02af38754e8ceab3f7164595975a6d7 URL: https://github.com/kamailio/kamailio/commit/91dcaafcc02af38754e8ceab3f71645… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-29T15:14:52+01:00 kamctl: regenerated database schema --- Modified: utils/kamctl/db_berkeley/kamailio/topos_d Modified: utils/kamctl/db_berkeley/kamailio/topos_t Modified: utils/kamctl/db_sqlite/topos-create.sql Modified: utils/kamctl/dbtext/kamailio/topos_d Modified: utils/kamctl/dbtext/kamailio/topos_t Modified: utils/kamctl/mysql/topos-create.sql Modified: utils/kamctl/oracle/topos-create.sql Modified: utils/kamctl/postgres/topos-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/91dcaafcc02af38754e8ceab3f71645… Patch: https://github.com/kamailio/kamailio/commit/91dcaafcc02af38754e8ceab3f71645…

7 years, 12 months

git:4.4:954b2980: lib/srdb1: schema - don't set default value for text/blob columns of topos

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 954b298097dcaba9cc0b26f9020ab585f299dceb URL: https://github.com/kamailio/kamailio/commit/954b298097dcaba9cc0b26f9020ab58… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-11-29T15:14:34+01:00 lib/srdb1: schema - don't set default value for text/blob columns of topos - not allowed by newer versions of mysql (cherry picked from commit 0eea31b4b934de45e8bc5091f7ba5a9d486dd16f) --- Modified: lib/srdb1/schema/topos_d.xml Modified: lib/srdb1/schema/topos_t.xml --- Diff: https://github.com/kamailio/kamailio/commit/954b298097dcaba9cc0b26f9020ab58… Patch: https://github.com/kamailio/kamailio/commit/954b298097dcaba9cc0b26f9020ab58… --- diff --git a/lib/srdb1/schema/topos_d.xml b/lib/srdb1/schema/topos_d.xml index cf62889..1f7fd35 100644 --- a/lib/srdb1/schema/topos_d.xml +++ b/lib/srdb1/schema/topos_d.xml @@ -128,21 +128,21 @@ <column id="a_rr"> <name>a_rr</name> <type>largetext</type> - <default/> + <null/> <description>Record route - A side</description> </column> <column id="b_rr"> <name>b_rr</name> <type>largetext</type> - <default/> + <null/> <description>Record route - B side</description> </column> <column id="s_rr"> <name>s_rr</name> <type>largetext</type> - <default/> + <null/> <description>Record route - S side</description> </column> diff --git a/lib/srdb1/schema/topos_t.xml b/lib/srdb1/schema/topos_t.xml index 86fcb2f..e3978f0 100644 --- a/lib/srdb1/schema/topos_t.xml +++ b/lib/srdb1/schema/topos_t.xml @@ -88,7 +88,7 @@ <column id="x_via"> <name>x_via</name> <type>largetext</type> - <default/> + <null/> <description>Via stack - A or B side</description> </column> @@ -104,21 +104,21 @@ <column id="x_rr"> <name>x_rr</name> <type>largetext</type> - <default/> + <null/> <description>RR stack - incoming A or B side</description> </column> <column id="y_rr"> <name>y_rr</name> <type>largetext</type> - <default/> + <null/> <description>RR stack - the other A or B side</description> </column> <column id="s_rr"> <name>s_rr</name> <type>largetext</type> - <default/> + <null/> <description>RR stack - the S side</description> </column>

7 years, 12 months

Siremis v4.3.0 Released

by Daniel-Constantin Mierla

Hello, a new release of Siremis, the web management interface for Kamailio, has been released recently. The main work was towards making it compatible with PHP 7 and the new constraints from MySQL 5.7+. The announcement is available at: - http://siremis.asipto.com/2016/11/26/siremis-v4-3-0-released/ Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World 2017 - May 8-10, in Berlin - www.kamailioworld.com

7 years, 12 months

[kamailio/kamailio] Kamailio core dumps on dialog_sendpublish (#865)

by Davy Van De Moere

On a not really loaded kamailio (less than 50 users at the moment), I'm getting a core dump every few days. I've tried multiple verisons of Kamailio, 4.4.x , 4.3.x and also on 5.0.0-dev7 . I can't reproduce it adhoc, but every few days it happens... backtrace: Version: version: kamailio 5.0.0-dev7 (x86_64/linux) 7360b0 [New LWP 29728] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -P /var/run/kamailio.pid -f /usr/local/etc/kamailio//k'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f92c5a0be98 in __dialog_sendpublish (dlg=0x7f92c0e3a6c0, type=64, _params=0x7f92c0423500 <params>) at pua_dialoginfo.c:264 264 uri = dlginfo->to_uri; (gdb) backtrace #0 0x00007f92c5a0be98 in __dialog_sendpublish (dlg=0x7f92c0e3a6c0, type=64, _params=0x7f92c0423500 <params>) at pua_dialoginfo.c:264 #1 0x00007f92c01e2563 in run_dlg_callbacks (type=64, dlg=0x7f92c0e3a6c0, req=0x7f92cc6d5db8, rpl=0x0, dir=1, dlg_data=0x0) at dlg_cb.c:256 #2 0x00007f92c01a92b1 in dlg_terminated (req=0x7f92cc6d5db8, dlg=0x7f92c0e3a6c0, dir=1) at dlg_handlers.c:366 #3 0x00007f92c01b610f in dlg_onroute (req=0x7f92cc6d5db8, route_params=0x7ffc7de27ba0, param=0x0) at dlg_handlers.c:1409 #4 0x00007f92c9292171 in run_rr_callbacks (req=0x7f92cc6d5db8, rr_param=0x7ffc7de27c20) at rr_cb.c:96 #5 0x00007f92c9287ac2 in after_loose (_m=0x7f92cc6d5db8, preloaded=0) at loose.c:928 #6 0x00007f92c9288168 in loose_route (_m=0x7f92cc6d5db8) at loose.c:962 #7 0x00007f92c928b7ee in w_loose_route (msg=0x7f92cc6d5db8, p1=0x0, p2=0x0) at rr_mod.c:266 #8 0x000000000041f5d9 in do_action (h=0x7ffc7de285b0, a=0x7f92cc5f7a70, msg=0x7f92cc6d5db8) at action.c:1054 #9 0x000000000042bcde in run_actions (h=0x7ffc7de285b0, a=0x7f92cc5f7a70, msg=0x7f92cc6d5db8) at action.c:1552 #10 0x000000000042c383 in run_actions_safe (h=0x7ffc7de29c60, a=0x7f92cc5f7a70, msg=0x7f92cc6d5db8) at action.c:1620 #11 0x000000000061fe86 in rval_get_int (h=0x7ffc7de29c60, msg=0x7f92cc6d5db8, i=0x7ffc7de28cc0, rv=0x7f92cc5f7bc8, cache=0x0) at rvalue.c:912 #12 0x00000000006243c3 in rval_expr_eval_int (h=0x7ffc7de29c60, msg=0x7f92cc6d5db8, res=0x7ffc7de28cc0, rve=0x7f92cc5f7bc0) at rvalue.c:1910 #13 0x000000000041f0d1 in do_action (h=0x7ffc7de29c60, a=0x7f92cc600430, msg=0x7f92cc6d5db8) at action.c:1030 #14 0x000000000042bcde in run_actions (h=0x7ffc7de29c60, a=0x7f92cc600430, msg=0x7f92cc6d5db8) at action.c:1552 #15 0x000000000041f548 in do_action (h=0x7ffc7de29c60, a=0x7f92cc6006d0, msg=0x7f92cc6d5db8) at action.c:1045 #16 0x000000000042bcde in run_actions (h=0x7ffc7de29c60, a=0x7f92cc6006d0, msg=0x7f92cc6d5db8) at action.c:1552 #17 0x000000000041c0fb in do_action (h=0x7ffc7de29c60, a=0x7f92cc545730, msg=0x7f92cc6d5db8) at action.c:678 #18 0x000000000042bcde in run_actions (h=0x7ffc7de29c60, a=0x7f92cc537760, msg=0x7f92cc6d5db8) at action.c:1552 #19 0x000000000042c44b in run_top_route (a=0x7f92cc537760, msg=0x7f92cc6d5db8, c=0x0) at action.c:1641 #20 0x00000000005726a2 in receive_msg ( buf=0xa1c200 <buf> "BYE sip:echo@123.48.11.215:5070;transport=udp SIP/2.0\r\nVia: SIP/2.0/UDP 0.0.0.0:5060;rport;branch=z9hG4bKPj26b505ba-7ede-4198-a917-bde966b6d8b6\r\nMax-Forwards: 69\r\nFrom: sip:192.168.60.1;tag=9a10d8ab-"..., len=462, rcv_info=0x7ffc7de29fb0) at receive.c:264 #21 0x000000000047bcdc in udp_rcv_loop () at udp_server.c:507 #22 0x0000000000509de1 in main_loop () at main.c:1618 #23 0x00000000005112de in main (argc=5, argv=0x7ffc7de2a478) at main.c:2639 (gdb) info locals tag = {s = 0x0, len = 0} uri = {s = 0x0, len = 0} target = {s = 0x0, len = 0} dlginfo = 0x0 __FUNCTION__ = "__dialog_sendpublish" (gdb) p dlginfo $1 = (struct dlginfo_cell *) 0x0 (gdb) p *dlginfo Cannot access memory at address 0x0 -- 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/865

7 years, 12 months

← Newer
1
...
4
5
6
7
8
9
10
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2016