sr-dev July 2016

sr-dev@lists.kamailio.org

29 participants
297 discussions

git:master:b7c588df: tm: store last received response code before running onreply_route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b7c588dff06030a82f305b210573be5bbc961cec URL: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T15:56:45+02:00 tm: store last received response code before running onreply_route - otherwise an innapropriate cancel can happen if the current branch got before an 1xx response, and the script writer enforces another reply code with t_reply() - reported by Thomas Sevestre, GH#315 --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… Patch: https://github.com/kamailio/kamailio/commit/b7c588dff06030a82f305b210573be5… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index b2e6e53..8da3205 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2286,10 +2286,21 @@ int reply_received( struct sip_msg *p_msg ) backup_xavps = xavp_set_list(&t->xavps_list); #endif setbflagsval(0, uac->branch_flags); + if(msg_status>last_uac_status) { + /* current response (msg) status is higher that the last received + * on the same branch - set it temporarily so functions in onreply_route + * can access it (e.g., avoid sending CANCEL by forcing another t_relply() + * in onreply_route when a negative sip response was received) */ + uac->last_received = msg_status; + } + /* Pre- and post-script callbacks have already * been executed by the core. (Miklos) */ run_top_route(onreply_rt.rlist[onreply_route], p_msg, &ctx); + + /* restore brach last_received as before executing onreply_route */ + uac->last_received = last_uac_status; /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags);

7 years, 9 months

git:master:1f7f96d0: http_client: removed unused variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1f7f96d093f333e07fb6d79156c1f15f32030255 URL: https://github.com/kamailio/kamailio/commit/1f7f96d093f333e07fb6d79156c1f15… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-31T11:46:36+02:00 http_client: removed unused variables --- Modified: modules/http_client/curlcon.c Modified: modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/1f7f96d093f333e07fb6d79156c1f15… Patch: https://github.com/kamailio/kamailio/commit/1f7f96d093f333e07fb6d79156c1f15… --- diff --git a/modules/http_client/curlcon.c b/modules/http_client/curlcon.c index b2caa4a..08ca03b 100644 --- a/modules/http_client/curlcon.c +++ b/modules/http_client/curlcon.c @@ -128,13 +128,12 @@ unsigned int curl_connection_count() */ int http_connection_exists(str *name) { - curl_con_t *cc; - if (curl_get_connection(name) != NULL) { return 1; } - LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", name->len, name->s); + LM_DBG("curl_connection_exists no success in looking for httpcon: [%.*s]\n", + name->len, name->s); return 0; } diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 3b6e808..71d630d 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -610,7 +610,6 @@ char *http_get_content_type(const str *connection) { curl_con_t *conn = NULL; curl_con_pkg_t *pconn = NULL; - str rval; /* Find connection if it exists */ if (!connection) {

7 years, 9 months

git:master:ee7992d3: dialog: jump to error if fails to parse requests in cseq update callback

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ee7992d30a73e61af056c47f9bd961c86fdf592c URL: https://github.com/kamailio/kamailio/commit/ee7992d30a73e61af056c47f9bd961c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-31T11:42:55+02:00 dialog: jump to error if fails to parse requests in cseq update callback --- Modified: modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/ee7992d30a73e61af056c47f9bd961c… Patch: https://github.com/kamailio/kamailio/commit/ee7992d30a73e61af056c47f9bd961c… --- diff --git a/modules/dialog/dlg_cseq.c b/modules/dialog/dlg_cseq.c index 48d1446..d902ae9 100644 --- a/modules/dialog/dlg_cseq.c +++ b/modules/dialog/dlg_cseq.c @@ -119,7 +119,7 @@ int dlg_cseq_update(sip_msg_t *msg) str *pval; if(dlg_cseq_prepare_msg(msg)!=0) { - goto done; + goto error; } if(msg->first_line.type==SIP_REPLY) { /* nothing to do for outgoing replies */

7 years, 9 months

git:master:fa32ffae: modules: readme files regenerated - uac ...

by Kamailio Dev

Module: kamailio Branch: master Commit: fa32ffaefd9379ed7f6e0c46371720bb18152999 URL: https://github.com/kamailio/kamailio/commit/fa32ffaefd9379ed7f6e0c46371720b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-07-29T16:46:16+02:00 modules: readme files regenerated - uac ... --- Modified: modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/fa32ffaefd9379ed7f6e0c46371720b… Patch: https://github.com/kamailio/kamailio/commit/fa32ffaefd9379ed7f6e0c46371720b…

7 years, 9 months

git: new commits in branch master

by GitHub

- URL: https://github.com/kamailio/kamailio/commit/fe16198f0d2698cc2bf2f719e018537… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:01:11+02:00 uac: uac_reg: fix uac_reg_get_byuser() The calculated hash was compared with uuid hash instead of user hash - URL: https://github.com/kamailio/kamailio/commit/3f6b6325e99f08f25a64e712c453035… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:01:11+02:00 uac: uac_reg: add uac_reg_status() function New function to obtain registration status from within configuration script - URL: https://github.com/kamailio/kamailio/commit/7416351dd6bca81f85691fec4d9c0cd… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:01:11+02:00 uac: uac_reg: protect the registration lists with locks Every list iteration must be protected - URL: https://github.com/kamailio/kamailio/commit/82679ac3047935684994bc46960ec1e… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:09+02:00 uac: uac_reg: Add function to remove registration - URL: https://github.com/kamailio/kamailio/commit/6850466e5322edd3bfcd6666e6657d3… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:23+02:00 uac: uac_reg: Use locking to prevent deletion of a registration entry when it is still being referenced Abuse the hash lock. All operations on a reg_uact_t entry are short duration, so just keep the lock on the hashlist entry during this time. - URL: https://github.com/kamailio/kamailio/commit/03f4ab5e3860d20d2e7788cbf914d19… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:31+02:00 uac: uac_reg: Add RPC function to remove a registration - URL: https://github.com/kamailio/kamailio/commit/a5c52fa30ec384ad4845cdbb3df21a1… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:38+02:00 uac: uac_reg: Add RPC function to add a new registration - URL: https://github.com/kamailio/kamailio/commit/9013adcb7d201c7f1a86a97d5f9f709… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:44+02:00 uac: uac_reg: Consolidate and sync (almost) duplicate code in adding an RPC node - URL: https://github.com/kamailio/kamailio/commit/b85c849393931aca1d04dfcff0de58a… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:02:53+02:00 uac: uac_reg: Return HTTP-like fault codes for RPC - URL: https://github.com/kamailio/kamailio/commit/e761c03a0a0a3f08e8c529a3af918ad… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:03:01+02:00 uac: uac_reg: Consolidate and optimize filtering records Instead of blindly iterating all hash table buckets, try to use the hash indices where possible. - URL: https://github.com/kamailio/kamailio/commit/72c77630070fe655a1f5c126d98d4a6… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T13:03:08+02:00 uac: uac_reg: Optimize updating a registration No need to search _again_, the to be updated reg is already known. - URL: https://github.com/kamailio/kamailio/commit/5d83785e8c9ce939106aba579ec4773… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:25+02:00 uac: uac_reg: Update of all fields when record is refreshed from DB More flexible and no more overallocating memory - URL: https://github.com/kamailio/kamailio/commit/bf3109234e62dd912751fa7dc79d60c… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:33+02:00 uac: uac_reg: Only set UAC_REG_INIT flag if it was not set yet - URL: https://github.com/kamailio/kamailio/commit/2cf3641354c45ff2d76064982037dc1… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:33+02:00 parser: Add parser for Min-Expires - URL: https://github.com/kamailio/kamailio/commit/a3e85c02b367638e1a17b0435506746… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:33+02:00 uac: uac_reg: Handle 423 response to outbound register Set the expires value to the value in the Min-Expires header, or double the current value if that header is absent in the response. To keep the code easier, the request won't be retried immediately, but on the next timer interval. - URL: https://github.com/kamailio/kamailio/commit/b1d03668d0794dfdbedd3df465698a9… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:33+02:00 uac: uac_reg: Use core parser instead of hand-parsing the Expires header - URL: https://github.com/kamailio/kamailio/commit/190ece98e606018fe0eabe4eff97cde… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:34+02:00 uac: uac_reg: Keep Call-ID in registration sequence As recommended by rfc3261 Â§10.2.4, keep the same Call-Id during a sequence of registrations. A new Call-ID will be generated after a registration failure or near a cseq wrap-around. The setting 'reg_keep_callid' controls this behaviour, defualt off. - URL: https://github.com/kamailio/kamailio/commit/e8f2c052d07ded94bc254d3f53ce55b… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:02:34+02:00 uac: uac_reg: Add setting for using a random reg_delay Will only take effect for registrations that have no reg_delay set in the database. - URL: https://github.com/kamailio/kamailio/commit/546ad530cef46e07902d16c1a6af6e2… Author: Alex Hermann <alex(a)speakup.nl> Date: 2016-07-28T14:11:53+02:00 uac: uac_reg: Deduplicate code for copying a record from DB to mem - URL: https://github.com/kamailio/kamailio/commit/ec25359122d5821cfe5ca2ee9ca710b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-07-29T16:37:26+02:00 Merge pull request #729 from gaaf/uac_reg_master Various improvements to uac registrations

7 years, 9 months

[kamailio/kamailio] Various improvements to uac registrations (#729)

by Alex

This PR contains my backlog of changes for uac registrations. Most patches are for making the registrations list fully dynamic (add/remove via RPC) Some fixes, some cleanups, some features... You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/729 -- Commit Summary -- * uac: uac_reg: fix uac_reg_get_byuser() * uac: uac_reg: protect the registration lists with locks * uac: uac_reg: add uac_reg_status() function * uac: uac_reg: Add function to remove registration * uac: uac_reg: Use locking to prevent deletion of a registration entry when it is still being referenced * uac: uac_reg: Add RPC function to remove a registration * uac: uac_reg: Add RPC function to add a new registration * uac: uac_reg: Consolidate and sync (almost) duplicate code in adding an RPC node * uac: uac_reg: Return HTTP-like fault codes for RPC * uac: uac_reg: Consolidate and optimize filtering records * uac: uac_reg: Optimize updating a registration * uac: uac_reg: Update of all fields when record is refreshed from DB * uac: uac_reg: Only set UAC_REG_INIT flag if it was not set yet * parser: Add parser for Min-Expires * uac: uac_reg: Handle 423 response to outbound register * uac: uac_reg: Use core parser instead of hand-parsing the Expires header * uac: uac_reg: Keep Call-ID in registration sequence * uac: uac_reg: Add setting for using a random reg_delay * uac: uac_reg: Deduplicate code for copying a record from DB to mem -- File Changes -- M modules/uac/doc/uac_admin.xml (89) M modules/uac/uac.c (26) M modules/uac/uac_reg.c (722) M modules/uac/uac_reg.h (3) M parser/case_min.h (47) M parser/hf.c (4) M parser/hf.h (3) M parser/msg_parser.c (5) M parser/msg_parser.h (1) M sip_msg_clone.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/729.patch https://github.com/kamailio/kamailio/pull/729.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/729

7 years, 9 months

git:master:90c8c08e: Merge pull request #728 from dunst0/master

by GitHub

Module: kamailio Branch: master Commit: 90c8c08e848689801c27a9d8d7cf25d8ecadf77c URL: https://github.com/kamailio/kamailio/commit/90c8c08e848689801c27a9d8d7cf25d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-29T16:18:39+02:00 Merge pull request #728 from dunst0/master userblacklist: little changes in debug output --- Modified: modules/userblacklist/userblacklist.c Modified: parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/90c8c08e848689801c27a9d8d7cf25d… Patch: https://github.com/kamailio/kamailio/commit/90c8c08e848689801c27a9d8d7cf25d…

7 years, 9 months

git:master:8baf73ad: core: msg_parser log output adaptations

by GitHub

Module: kamailio Branch: master Commit: 8baf73ad348fa17c12e54a7b0411f021af98b29e URL: https://github.com/kamailio/kamailio/commit/8baf73ad348fa17c12e54a7b0411f02… Author: Rick <dunst0(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-29T10:54:53+02:00 core: msg_parser log output adaptations - switched LM_ERR to ERR - removed ERROR, DEBUG form log message string - removed function name from log message string - changed LOG(L_CRIT, "BUG: ....") to BUG("...") --- Modified: parser/msg_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/8baf73ad348fa17c12e54a7b0411f02… Patch: https://github.com/kamailio/kamailio/commit/8baf73ad348fa17c12e54a7b0411f02…

7 years, 9 months

git:master:31b86621: userblacklist: little changes in debug output

by GitHub

Module: kamailio Branch: master Commit: 31b86621adb352cb15c5b56404e5bc6a3a051535 URL: https://github.com/kamailio/kamailio/commit/31b86621adb352cb15c5b56404e5bc6… Author: Rick <dunst0(a)users.noreply.github.com> Committer: GitHub <noreply(a)github.com> Date: 2016-07-28T12:30:31+02:00 userblacklist: little changes in debug output - Fixed confusing debug output in module for global blacklists and whitelists --- Modified: modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/31b86621adb352cb15c5b56404e5bc6… Patch: https://github.com/kamailio/kamailio/commit/31b86621adb352cb15c5b56404e5bc6… --- diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c index 2a1a448..39ec68b 100644 --- a/modules/userblacklist/userblacklist.c +++ b/modules/userblacklist/userblacklist.c @@ -534,6 +534,9 @@ static int check_blacklist(sip_msg_t *msg, struct check_blacklist_fs_t *arg1) /* LM_DBG("whitelisted"); */ ret = 1; /* found, but is whitelisted */ } + else { + LM_DBG("entry %s is blacklisted\n", req_number); + } } else { /* LM_ERR("not found"); */ @@ -541,7 +544,6 @@ static int check_blacklist(sip_msg_t *msg, struct check_blacklist_fs_t *arg1) } lock_release(lock); - LM_DBG("entry %s is blacklisted\n", req_number); return ret; } @@ -580,6 +582,9 @@ static int check_whitelist(sip_msg_t *msg, struct check_blacklist_fs_t *arg1) /* LM_DBG("whitelisted"); */ ret = 1; /* found, but is whitelisted */ } + else { + LM_DBG("entry %s is blacklisted\n", req_number); + } } else { /* LM_ERR("not found"); */ @@ -587,7 +592,6 @@ static int check_whitelist(sip_msg_t *msg, struct check_blacklist_fs_t *arg1) } lock_release(lock); - LM_DBG("entry %s is blacklisted\n", req_number); return ret; }

7 years, 9 months

[kamailio/kamailio] userblacklist: little changes in debug output (#728)

by Rick

- Fixed confusing debug output in module for global blacklists and whitelists You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/728 -- Commit Summary -- * userblacklist: little changes in debug output -- File Changes -- M modules/userblacklist/userblacklist.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/728.patch https://github.com/kamailio/kamailio/pull/728.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/728

7 years, 9 months

← Newer
1
2
3
4
5
6
7
8
9
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2016