Implement load and restore of usrloc contact attributes in the t_load_contacts, t_next_contacts and t_next_contact_flows functions in tm module.
Includes documentation of the new tm parameter 'xavp_contact' You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/178
-- Commit Summary --
* usrloc: Update documentation concerning xavp_contact parameter * tm: Load and restore contact attributes when serial forking
-- File Changes --
M modules/tm/README (310) M modules/tm/doc/params.xml (21) M modules/tm/t_serial.c (51) M modules/tm/tm.c (2) M modules/usrloc/README (6) M modules/usrloc/doc/usrloc_admin.xml (6)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/178.patch https://github.com/kamailio/kamailio/pull/178.diff
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178
Does anyone have any comments on my fix? Can I merge and backport?
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-110014961
Hugh Waite writes:
Does anyone have any comments on my fix? Can I merge and backport?
I think I implemented those tm functions. Does your fix require any config file changes to the present use of those functions? If not, I have nothing against them.
-- Juha
The tm module needs to know the name of the attributes AVP, which is currently passed as a modparam to the usrloc module. Therefore to 'activate' this bugfix, you need to pass the same modparam to the tm module.E.g. `modparam("usrloc|tm", "xavp_contact", "ulattrs")` If the modparam is not given to tm, the system will behave as before. There are no changes to the way the functions are called.
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-110278255
Hugh Waite writes:
The tm module needs to know the name of the attributes AVP, which is currently passed as a modparam to the usrloc module. Therefore to 'activate' this bugfix, you need to pass the same modparam to the tm module.E.g. `modparam("usrloc|tm", "xavp_contact", "ulattrs")` If the modparam is not given to tm, the system will behave as before. There are no changes to the way the functions are called.
What happened to the fix? Did it go to 4.3?
-- Juha
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-110833961
No, is not in 4.3 --- actually, this pull request is not even merged in master.
As I see the comments above, the discussion was still open. From my point of view, it can be merged and backported if it is a fix.
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-111036727
Merged #178.
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#event-328247702
Hugh Waite writes:
The tm module needs to know the name of the attributes AVP, which is currently passed as a modparam to the usrloc module. Therefore to 'activate' this bugfix, you need to pass the same modparam to the tm module.E.g. `modparam("usrloc|tm", "xavp_contact", "ulattrs")` If the modparam is not given to tm, the system will behave as before. There are no changes to the way the functions are called.
i'm still confused about xavp_contact tm module parameter. when i implemented t_load_contacts(), t_next_contacts() and t_next_contact_flows() functions, contacts_avp and contact_flows_avp defined the xavps that those functions used as described in tm README on those functions.
now there is another variable xavp_contact. tm README tells about it that it is used for storing attributes per contact, but does tell how the xavp gets set. usrloc README tells that xavp gets set at lookup (if i got it right), but is also tells "The tm module parameter xavp_contact must also be set to the same value to use the t_load_contacts and t_next_contacts functions".
does that mean that t_load_contacts()/t_next_contacts() does not anymore work if xavp_contact parameter is not defined for tm and usrloc modules?
-- juha
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-111514198
If the usrloc parameter "xavp_contact" is set, the given XAVP is populated with the contact attributes when the "lookup" function is called. The usrloc README example uses the name 'ulattrs'.
The tm module parameters 'contacts_avp' and 'contact_flows_avp' are populated when the t_load_contacts() function is called. These store the data from the branch structures but, before my changes, did not know anything about the attributes loaded by usrloc.
My changes mean that the usrloc attributes are now loaded into the 'contacts_avp' data when t_load_contacts() is called. However, the tm module needs to know the name of the XAVP that usrloc stored these attributes in, hence the new parameter and why they must have the same value.
If you do not set the 'xavp_contact' parameter in usrloc, then attributes are not stored / loaded when you call 'register' / 'lookup'. It is therefore not needed in tm module either. If you supply the parameter to usrloc, but NOT tm, then the attributes are ignored by the load/next_contacts functions and the bug will still be present.
--- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/178#issuecomment-111520934
Hugh Waite writes:
The tm module parameters 'contacts_avp' and 'contact_flows_avp' are populated when the t_load_contacts() function is called. These store the data from the branch structures but, before my changes, did not know anything about the attributes loaded by usrloc.
thanks for your explanation. by usrloc attributes you mean all the fields of location table?
-- juha
-
Daniel-Constantin Mierla -
Hugh Waite
-
Juha Heinanen -
juha-h