sr-dev

sr-dev@lists.kamailio.org

15 participants
45351 discussions

git:master:b3e01c14: pv: fixes for KEMI pvx.xavp_getd
by Victor Seva 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: b3e01c149433c26e8792f1caf77b189d85378055 URL: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-04-21T13:27:38+02:00 pv: fixes for KEMI pvx.xavp_getd --- Modified: src/modules/pv/pv.c --- Diff: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… Patch: https://github.com/kamailio/kamailio/commit/b3e01c149433c26e8792f1caf77b189… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 2574148c04..511a0e3b29 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -1402,7 +1402,7 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp); /** * SR_KEMIP_ARRAY with values of xavp=>name */ -sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) +sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str *name) { sr_kemi_dict_item_t *ini = NULL; sr_kemi_dict_item_t *val; @@ -1416,7 +1416,7 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) } memset(ini, 0, sizeof(sr_kemi_xval_t)); ini->vtype = SR_KEMIP_ARRAY; - while(avp!=NULL&&!STR_EQ(avp->name,name)) + while(avp!=NULL&&!STR_EQ(avp->name,*name)) { avp = avp->next; } @@ -1467,8 +1467,8 @@ sr_kemi_dict_item_t* ki_xavp_dict_name(sr_xavp_t *xavp, str name) last->next = val; } else { ini->v.dict = val; - last = val; } + last = val; avp = xavp_get_next(avp); } return ini; @@ -1509,13 +1509,13 @@ sr_kemi_dict_item_t* ki_xavp_dict(sr_xavp_t *xavp) val->vtype = SR_KEMIP_DICT; val->name.s = keys->s.s; val->name.len = keys->s.len; - val->v.dict = ki_xavp_dict_name(avp, keys->s); + val->v.dict = ki_xavp_dict_name(avp, &keys->s); if(last) { last->next = val; } else { ini = val; - last = ini; } + last = val; k = keys; keys = keys->next; pkg_free(k);

1 0

git:master:55c6f775: presence: compute presentity table slot index using correct structure
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 55c6f7751c81c8d738409e8c9470224ab9924cb7 URL: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T12:55:17+02:00 presence: compute presentity table slot index using correct structure --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… Patch: https://github.com/kamailio/kamailio/commit/55c6f7751c81c8d738409e8c9470224… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 6d868e165d..6767f8e007 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -1024,7 +1024,7 @@ int ps_ptable_replace(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1082,7 +1082,7 @@ int ps_ptable_update(ps_presentity_t *pt) ptc.ruid = pres_sruid.uid; } - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist; @@ -1138,7 +1138,7 @@ int ps_ptable_remove(ps_presentity_t *pt) memcpy(&ptc, pt, sizeof(ps_presentity_t)); ptc.hashid = core_case_hash(&pt->user, &pt->domain, 0); - idx = ptn->hashid % _ps_ptable->ssize; + idx = ptc.hashid % _ps_ptable->ssize; lock_get(&_ps_ptable->slots[idx].lock); ptn = _ps_ptable->slots[idx].plist;

1 0

[kamailio/kamailio] ims_registrar_scscf: fix aor generating in lookup() (#2287)
by alexyosifov 21 Apr '20

21 Apr '20

- If uri contains some parameters before '@' as phone context, till now the function strips everything after that. With the fix all parameters before and after '@' are stripped and the domain remaining.   #### 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:  - [ ] PR should be backported to stable branches - [x] 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/2287 -- Commit Summary -- * ims_registrar_scscf: fix aor generating in lookup() -- File Changes -- M src/modules/ims_registrar_scscf/lookup.c (62) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2287.patch https://github.com/kamailio/kamailio/pull/2287.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/2287

2 6

[kamailio/kamailio] ims_registrar_scscf: fix multiple contacts in NOTIFY (#2246)
by alexyosifov 21 Apr '20

21 Apr '20

- Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure.   #### 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:  - [ ] PR should be backported to stable branches - [x] 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/2246 -- Commit Summary -- * ims_registrar_scscf: fix multiple contacts in NOTIFY -- File Changes -- M src/modules/ims_registrar_scscf/registrar_notify.c (86) M src/modules/ims_registrar_scscf/registrar_notify.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2246.patch https://github.com/kamailio/kamailio/pull/2246.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/2246

5 16

git:master:058edd77: Merge pull request #2246 from alexyosifov/ims_registrar_scscf_notify_fix
by GitHub 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 058edd7730436c0e7aa3cea7f0b9ec5bd47cff5b URL: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5… Author: ng-voice GmbH <carsten(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2020-04-21T11:52:27+02:00 Merge pull request #2246 from alexyosifov/ims_registrar_scscf_notify_fix ims_registrar_scscf: fix multiple contacts in NOTIFY --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5… Patch: https://github.com/kamailio/kamailio/commit/058edd7730436c0e7aa3cea7f0b9ec5…

1 0

git:master:fa8b7941: ims_registrar_scscf: fix multiple contacts in NOTIFY
by Aleksandar Yosifov 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: fa8b7941c4d14625beadd4943d89e898543c7377 URL: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-21T12:24:48+03:00 ims_registrar_scscf: fix multiple contacts in NOTIFY - Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure. --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89… Patch: https://github.com/kamailio/kamailio/commit/fa8b7941c4d14625beadd4943d89e89…

1 0

git:master:7e9fe7f0: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 7e9fe7f03ef6914364e8147325515f6a4d3870f1 URL: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-04-21T10:16:25+02:00 modules: readme files regenerated - presence ... [skip ci] --- Modified: src/modules/presence/README --- Diff: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… Patch: https://github.com/kamailio/kamailio/commit/7e9fe7f03ef6914364e8147325515f6… --- diff --git a/src/modules/presence/README b/src/modules/presence/README index c4ba8ca1b1..9a73e47262 100644 --- a/src/modules/presence/README +++ b/src/modules/presence/README @@ -85,6 +85,7 @@ Juha Heinanen 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 6. Exported Variables @@ -232,6 +233,7 @@ Chapter 1. Admin Guide 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 6. Exported Variables @@ -1045,6 +1047,7 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); 5.1. presence.cleanup 5.2. presence.refreshWatchers 5.3. presence.updateWatchers + 5.4. presence.presentity_list 5.1. presence.cleanup @@ -1106,6 +1109,23 @@ kamcmd presence.refreshWatchers sip:test@kamailio.org presence 1 kamcmd presence.updateWatchers sip:alice@domain.com presence ... +5.4. presence.presentity_list + + List the presentity records stored in memory. + + Name: presence.presentity_list + + Parameters: + * mode - (optional) it can be 'full' to print all the fields of + presentity record. If missine, only a selected set of fields are + printed in the response. + + RPC Command Format: +... +kamctl rpc presence.presentity_list +kamctl rpc presence.presentity_list full +... + 6. Exported Variables 6.1. $subs(attr)

1 0

Re: [sr-dev] [kamailio/kamailio] presence: functions to keep presentity records in memory (f917318)
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

@eschmidbauer - can you help testing somehow? Not having the possibility to test properly here, working mainly from home these days I can't use many devices. First would be to make sure existing your existing config is still working fine. I tried to be very non-intrusive as much as possible in the old code and operation mode. Then, to test in-memory only presentity records, set: ``` modparam("presence", "publ_cache", 2) ``` You have to use latest master branch. I did basic tests with baresip for handling the PUBLISH requests and I could see they are in database presentity table if publ_cache!=2 as well as in memory via rpc command if publ_cache==2. You can set also subscription records in memory with: ``` modparam("presence", "subs_db_mode", 0) ``` -- 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/commit/f917318c1e5fefa4106eaaf46123506…

1 0

git:master:58bb516e: presence: docs for rpc command presence.presentity_list
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: 58bb516e4fe1b098bc574d75bef32af9d2ae61b8 URL: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T10:04:49+02:00 presence: docs for rpc command presence.presentity_list --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… Patch: https://github.com/kamailio/kamailio/commit/58bb516e4fe1b098bc574d75bef32af… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 850e929f67..32b67d6c6b 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -1346,6 +1346,33 @@ pres_update_watchers("sip:test@kamailio.org", "presence"); ... </programlisting> </section> + <section id="presence.rpc.presentity_list"> + <title>presence.presentity_list</title> + <para> + List the presentity records stored in memory. + </para> + <para> + Name: <emphasis>presence.presentity_list</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem> + <para>mode - (optional) it can be 'full' to print all the + fields of presentity record. If missine, only a selected + set of fields are printed in the response.</para> + </listitem> + </itemizedlist> + <para> + RPC Command Format: + </para> + <programlisting format="linespecific"> +... +kamctl rpc presence.presentity_list +kamctl rpc presence.presentity_list full +... + </programlisting> + </section> + </section> <section>

1 0

git:master:c62e411b: presence: implemented rpc command to list presententy records in memory
by Daniel-Constantin Mierla 21 Apr '20

21 Apr '20

Module: kamailio Branch: master Commit: c62e411b116db7f9b9227b9decd37866e62f4378 URL: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-04-21T09:57:30+02:00 presence: implemented rpc command to list presententy records in memory - presence.presentity_list [mode] - mode is optional and can be 'full' to print all attributes of the presentity record --- Modified: src/modules/presence/hash.c Modified: src/modules/presence/hash.h Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… Patch: https://github.com/kamailio/kamailio/commit/c62e411b116db7f9b9227b9decd3786… --- diff --git a/src/modules/presence/hash.c b/src/modules/presence/hash.c index 7a58fe5309..6d868e165d 100644 --- a/src/modules/presence/hash.c +++ b/src/modules/presence/hash.c @@ -705,6 +705,11 @@ int update_phtable(presentity_t *presentity, str *pres_uri, str *body) static ps_ptable_t *_ps_ptable = NULL; +ps_ptable_t *ps_ptable_get(void) +{ + return _ps_ptable; +} + #define PS_PRESENTITY_FIELD_COPY(field) do { \ if (pt->field.s) { \ ptn->field.s = p; \ @@ -945,6 +950,7 @@ void ps_ptable_destroy(void) } for(i=0; i<_ps_ptable->ssize; i++) { lock_destroy(&_ps_ptable->slots[i].lock); + pt = _ps_ptable->slots[i].plist; while(pt!=NULL) { ptn = pt->next; ps_presentity_free(pt, 0); diff --git a/src/modules/presence/hash.h b/src/modules/presence/hash.h index 96621efe5b..45732426f5 100644 --- a/src/modules/presence/hash.h +++ b/src/modules/presence/hash.h @@ -180,5 +180,6 @@ int ps_ptable_remove(ps_presentity_t *pt); ps_presentity_t *ps_ptable_get_list(str *user, str *domain); ps_presentity_t *ps_ptable_get_item(str *user, str *domain, str *event, str *etag); ps_presentity_t *ps_ptable_get_expired(int eval); +ps_ptable_t *ps_ptable_get(void); #endif diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index c0e1912ecd..84997b4230 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1847,6 +1847,83 @@ static const char *rpc_presence_cleanup_doc[3] = { 0 }; +/*! \brief + * rpc cmd: presence.presentity_list + * \mode - output attributes control + * * */ +void rpc_presence_presentity_list(rpc_t *rpc, void *ctx) +{ + str omode = {0, 0}; + int imode = 0; + int i = 0; + ps_ptable_t *ptb = NULL; + ps_presentity_t *ptn = NULL; + void* th = NULL; + str pempty = str_init(""); + + LM_DBG("listing in memory presentity records\n"); + + imode = rpc->scan(ctx, "*S", &omode); + if(imode < 1) { + imode = 0; + } else { + if(omode.len == 4 && strncmp(omode.s, "full", 4)==0) { + imode = 1; + } else { + imode = 0; + } + } + ptb = ps_ptable_get(); + if(ptb == NULL) { + return; + } + + for(i=0; i<ptb->ssize; i++) { + lock_get(&ptb->slots[i].lock); + ptn = ptb->slots[i].plist; + while(ptn!=NULL) { + /* add record node */ + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + lock_release(&ptb->slots[i].lock); + return; + } + /* add common fields */ + if(rpc->struct_add(th, "SSSSSd", + "user", &ptn->user, + "domain", &ptn->domain, + "event", &ptn->event, + "etag", &ptn->etag, + "sender", (ptn->sender.s)?&ptn->sender:&pempty, + "expires", ptn->expires)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + if(imode==1) { + /* add extra fields */ + if(rpc->struct_add(th, "ddSSd", + "received_time", ptn->received_time, + "priority", ptn->priority, + "ruid", (ptn->ruid.s)?&ptn->ruid:&pempty, + "body", (ptn->body.s)?&ptn->body:&pempty, + "hashid", ptn->hashid)<0) { + rpc->fault(ctx, 500, "Internal error adding item"); + lock_release(&ptb->slots[i].lock); + return; + } + } + ptn = ptn->next; + } + lock_release(&ptb->slots[i].lock); + } + return; +} + +static const char *rpc_presence_presentity_list_doc[2] = { + "Trigger update of watchers", + 0 +}; rpc_export_t presence_rpc[] = { {"presence.cleanup", rpc_presence_cleanup, rpc_presence_cleanup_doc, 0}, @@ -1854,6 +1931,8 @@ rpc_export_t presence_rpc[] = { rpc_presence_refresh_watchers_doc, 0}, {"presence.updateWatchers", rpc_presence_update_watchers, rpc_presence_update_watchers_doc, 0}, + {"presence.presentity_list", rpc_presence_presentity_list, + rpc_presence_presentity_list_doc, 0}, {0, 0, 0, 0} };

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev