sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

git:master:5799e272: dispatcher: detailed the subfields of xavp_dst for xavp_dst_mode param

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 5799e2722ad1d7df24548a0e19319b56a78a126b URL: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-13T09:01:07+02:00 dispatcher: detailed the subfields of xavp_dst for xavp_dst_mode param --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… Patch: https://github.com/kamailio/kamailio/commit/5799e2722ad1d7df24548a0e19319b5… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index f0636b4ab3..2706683ed5 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -328,10 +328,27 @@ modparam("dispatcher", "force_dst", 1) <title><varname>xavp_dst_mode</varname> (int)</title> <para> Control what fields are added to the XAVP specified by xavp_dst - parameter. The addeded fields are: the set id (group id), the URI - address, socket pointer, and destination unique id in case of call load - distribution algorithm. The attributes are added if xavp_dst_mode does - not have the bit 1 set. + parameter. + </para> + <para> + The addeded fields are: + <itemizedlist> + <listitem> + grp - the set id (group id). + </listitem> + <listitem> + uri - the URI address. + </listitem> + <listitem> + sock - the socket pointer. + </listitem> + <listitem> + dstid - the destination unique id (in case of call load distribution algorithm). + </listitem> + <listitem> + attrs - the attributes - they are added if xavp_dst_mode does not have the bit 1 set. + </listitem> + </itemizedlist> </para> <para> <emphasis>

6 years

[kamailio/kamailio] ims_usrloc_scscf: bugfix Contct is removed when old Contct expires (#1547)

by Christoph VALENTIN

in function unlink_contact_from_impu() (in file impurecord.c) an assignment "=" is used instead of a comparision operator "==". This leads to mess, when old contact expires.   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally versus release 5.1.0 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This is the pull request for branch 5.1, which has been created by "cherry-pick" from the original commit You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1547 -- Commit Summary -- * ims_usrloc_scscf: bugfix Contct is removed when old Contct expires -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1547.patch https://github.com/kamailio/kamailio/pull/1547.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/1547

6 years

git:master:79378819: dispatcher: docs - updated sample config

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 793788196669499aa633e2495a372449ba4db4e0 URL: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T11:51:34+02:00 dispatcher: docs - updated sample config --- Modified: src/modules/dispatcher/doc/dispatcher.cfg --- Diff: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… Patch: https://github.com/kamailio/kamailio/commit/793788196669499aa633e2495a37244… --- diff --git a/src/modules/dispatcher/doc/dispatcher.cfg b/src/modules/dispatcher/doc/dispatcher.cfg index f5634e45a6..7c2610ccf0 100644 --- a/src/modules/dispatcher/doc/dispatcher.cfg +++ b/src/modules/dispatcher/doc/dispatcher.cfg @@ -118,10 +118,8 @@ modparam("tm", "fr_inv_timer", 40000) modparam("dispatcher", "db_url", DBURL) modparam("dispatcher", "table_name", "dispatcher") modparam("dispatcher", "flags", 2) -modparam("dispatcher", "dst_avp", "$avp(AVP_DST)") -modparam("dispatcher", "grp_avp", "$avp(AVP_GRP)") -modparam("dispatcher", "cnt_avp", "$avp(AVP_CNT)") -modparam("dispatcher", "sock_avp", "$avp(AVP_SOCK)") +modparam("dispatcher", "xavp_dst", "_dsdst_") +modparam("dispatcher", "xavp_ctx", "_dsctx_") ####### Routing Logic ######## @@ -133,25 +131,27 @@ request_route { # per request initial checks route(REQINIT); - # handle requests within SIP dialogs - route(WITHINDLG); - - ### only initial requests (no To tag) - # CANCEL processing - if (is_method("CANCEL")) - { - if (t_check_trans()) - t_relay(); + if (is_method("CANCEL")) { + if (t_check_trans()) { + route(RELAY); + } exit; } # handle retransmissions - if(t_precheck_trans()) { + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } t_check_trans(); - exit; } - t_check_trans(); + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) # record routing for dialog forming requests (in case they are routed) # - remove preloaded route headers @@ -259,7 +259,7 @@ route[DISPATCH] { send_reply("404", "No destination"); exit; } - xlog("L_DBG", "--- SCRIPT: going to <$ru> via <$du>\n"); + xdbg("--- SCRIPT: going to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit; @@ -274,6 +274,7 @@ failure_route[RTF_DISPATCH] { if (t_check_status("500") or (t_branch_timeout() and !t_branch_replied())) { if(ds_next_dst()) { + xdbg("--- SCRIPT: retrying to <$ru> via <$du> (attrs: $xavp(_dsdst_=>attrs))\n"); t_on_failure("RTF_DISPATCH"); route(RELAY); exit;

6 years

git:master:c9e5b863: dispatcher: add xavp after the previous one

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c9e5b863c7f6fa37752a34aab87bca36951a0c9d URL: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T10:14:49+02:00 dispatcher: add xavp after the previous one - more natural way to add the xapvs and fixes the case when limit was given and destinations with lower priority made it in the xavp --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3… Patch: https://github.com/kamailio/kamailio/commit/c9e5b863c7f6fa37752a34aab87bca3…

6 years

git:master:151299d0: core: xavp - new helper function xavp_add_value_after()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 151299d057f858277d32c360221f7a93542c40d3 URL: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T10:14:26+02:00 core: xavp - new helper function xavp_add_value_after() --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… Patch: https://github.com/kamailio/kamailio/commit/151299d057f858277d32c360221f7a9… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index e6acefd9c9..e1cf394171 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -195,6 +195,26 @@ sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) return avp; } +sr_xavp_t *xavp_add_value_after(str *name, sr_xval_t *val, sr_xavp_t *pxavp) +{ + sr_xavp_t *avp=0; + + avp = xavp_new_value(name, val); + if (avp==NULL) + return NULL; + + /* link new xavp */ + if(pxavp) { + avp->next = pxavp->next; + pxavp->next = avp; + } else { + avp->next = *_xavp_list_crt; + *_xavp_list_crt = avp; + } + + return avp; +} + sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *ravp=0; diff --git a/src/core/xavp.h b/src/core/xavp.h index 2177461d69..83f4f09b15 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -78,6 +78,7 @@ int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); +sr_xavp_t *xavp_add_value_after(str *name, sr_xval_t *val, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start);

6 years

git:master:f056213c: core: xavp - helper functions to get last by name and add after an item

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f056213ca78c94419450f45fd3b26e9328c1a731 URL: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:49:38+02:00 core: xavp - helper functions to get last by name and add after an item --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… Patch: https://github.com/kamailio/kamailio/commit/f056213ca78c94419450f45fd3b26e9… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c8ff12365f..e6acefd9c9 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -162,6 +162,19 @@ int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list) return 0; } +int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp) +{ + if(pxavp==NULL) { + nxavp->next = *_xavp_list_crt; + *_xavp_list_crt = nxavp; + } else { + nxavp->next = pxavp->next; + pxavp->next = nxavp; + } + + return 0; +} + sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list) { sr_xavp_t *avp=0; @@ -305,6 +318,22 @@ sr_xavp_t *xavp_get_next(sr_xavp_t *start) return NULL; } +sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list) +{ + sr_xavp_t *prev; + sr_xavp_t *crt; + + crt = xavp_get_internal(xname, list, 0, 0); + + prev = NULL; + + while(crt) { + prev = crt; + crt = xavp_get_next(prev); + } + + return prev; +} int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head) { diff --git a/src/core/xavp.h b/src/core/xavp.h index 839e486523..2177461d69 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -76,12 +76,14 @@ void xavp_free(sr_xavp_t *xa); int xavp_add(sr_xavp_t *xavp, sr_xavp_t **list); int xavp_add_last(sr_xavp_t *xavp, sr_xavp_t **list); +int xavp_add_after(sr_xavp_t *nxavp, sr_xavp_t *pxavp); sr_xavp_t *xavp_add_value(str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_add_xavp_value(str *rname, str *name, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_set_value(str *name, int idx, sr_xval_t *val, sr_xavp_t **list); sr_xavp_t *xavp_get(str *name, sr_xavp_t *start); sr_xavp_t *xavp_get_by_index(str *name, int idx, sr_xavp_t **start); sr_xavp_t *xavp_get_next(sr_xavp_t *start); +sr_xavp_t *xavp_get_last(str *xname, sr_xavp_t **list); int xavp_rm_by_name(str *name, int all, sr_xavp_t **head); int xavp_rm_by_index(str *name, int idx, sr_xavp_t **head); int xavp_rm(sr_xavp_t *xa, sr_xavp_t **head);

6 years

git:master:21addddd: dispatcher: store socket pointer in xavp instead serializing address to string

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21addddda9a520f6f1aace3ac3f25de897e60e4d URL: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:48:44+02:00 dispatcher: store socket pointer in xavp instead serializing address to string --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… Patch: https://github.com/kamailio/kamailio/commit/21addddda9a520f6f1aace3ac3f25de… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 15d17b36c0..a63f150308 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -1836,9 +1836,8 @@ int ds_add_xavp_record(ds_set_t *dsidx, int pos, int set, int alg) if(dsidx->dlist[pos].sock) { memset(&nxval, 0, sizeof(sr_xval_t)); - nxval.type = SR_XTYPE_STR; - nxval.v.s.len = 1 + sprintf(buf, "%p", dsidx->dlist[pos].sock); - nxval.v.s.s = buf; + nxval.type = SR_XTYPE_VPTR; + nxval.v.vptr = dsidx->dlist[pos].sock; if(xavp_add_value(&ds_xavp_dst_sock, &nxval, &nxavp)==NULL) { xavp_destroy_list(&nxavp); LM_ERR("failed to add destination sock xavp field\n"); @@ -2203,11 +2202,9 @@ int ds_next_dst(struct sip_msg *msg, int mode) } lxavp = xavp_get(&ds_xavp_dst_sock, rxavp); - if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_STR) { + if(lxavp!=NULL && lxavp->val.type==SR_XTYPE_VPTR) { LM_DBG("socket enforced in next destination record\n"); - if(sscanf(lxavp->val.v.s.s, "%p", (void **)&sock) != 1) { - sock = NULL; - } + sock = lxavp->val.v.vptr; } lxavp = xavp_get(&ds_xavp_dst_addr, rxavp);

6 years

git:master:d82ccbd9: core: xavp - extended to hold a bare void pointer value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d82ccbd9480c96e12b7fa668a1a950e2873a834c URL: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:25:59+02:00 core: xavp - extended to hold a bare void pointer value - useful to link data that doesn't need cloning or freeing --- Modified: src/core/xavp.c Modified: src/core/xavp.h --- Diff: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… Patch: https://github.com/kamailio/kamailio/commit/d82ccbd9480c96e12b7fa668a1a950e… --- diff --git a/src/core/xavp.c b/src/core/xavp.c index c9529a02f6..c8ff12365f 100644 --- a/src/core/xavp.c +++ b/src/core/xavp.c @@ -522,6 +522,9 @@ void xavp_print_list_content(sr_xavp_t **head, int level) LM_INFO(" XAVP value: <xavp:%p>\n", avp->val.v.xavp); xavp_print_list_content(&avp->val.v.xavp, level+1); break; + case SR_XTYPE_VPTR: + LM_INFO(" XAVP value: <vptr:%p>\n", avp->val.v.vptr); + break; case SR_XTYPE_DATA: LM_INFO(" XAVP value: <data:%p>\n", avp->val.v.data); break; diff --git a/src/core/xavp.h b/src/core/xavp.h index 8014bc5694..839e486523 100644 --- a/src/core/xavp.h +++ b/src/core/xavp.h @@ -35,6 +35,7 @@ typedef enum { SR_XTYPE_LONG, /* long value */ SR_XTYPE_LLONG, /* long long value */ SR_XTYPE_XAVP, /* xavp value */ + SR_XTYPE_VPTR, /* void pointer value */ SR_XTYPE_DATA /* custom data value */ } sr_xtype_t; @@ -57,6 +58,7 @@ typedef struct _sr_xval { long l; long long ll; struct _sr_xavp *xavp; /* must be given in shm (not cloned) */ + void *vptr; /* void pointer - address copied, not freed */ sr_data_t *data; /* must be given in shm (not cloned) */ } v; } sr_xval_t;

6 years

git:master:d445ae6b: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: d445ae6bdb9adbf6c35c8518e21c7657dfc6583a URL: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-06-12T09:16:43+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765… Patch: https://github.com/kamailio/kamailio/commit/d445ae6bdb9adbf6c35c8518e21c765…

6 years

git:master:f6960f87: dispatcher: added defines for dst address update operations

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f6960f8771fc0689f6923c58a3e5d683434a6a11 URL: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-12T09:01:50+02:00 dispatcher: added defines for dst address update operations --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68… Patch: https://github.com/kamailio/kamailio/commit/f6960f8771fc0689f6923c58a3e5d68…

6 years

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018