sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
270 discussions

git:master:ba7d1d2e: Merge pull request #2484 from kamailio/jchavanton/dlg_missmatch

by GitHub

Module: kamailio Branch: master Commit: ba7d1d2e586ed22dcc78898eaa08abd61606212a URL: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-09-29T08:41:34-07:00 Merge pull request #2484 from kamailio/jchavanton/dlg_missmatch dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… Patch: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5557e87574..93d35f553b 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -865,6 +865,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, unsigned int *dir, int mode) { struct dlg_cell *dlg; + struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; d_entry = &(d_table->entries[h_entry]); @@ -876,13 +877,24 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { ref_dlg_unsafe(dlg, 1); if(likely(mode==0)) dlg_unlock( d_table, d_entry); - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + + /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ + if (dlg->tag[1].len == 0) { + dlg_no_totag=dlg; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", + callid->len, callid->s,h_entry,*dir); + continue; + } + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", + callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + return dlg; } } if(likely(mode==0)) dlg_unlock( d_table, d_entry); + if (dlg_no_totag) return dlg_no_totag; + LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

4 years, 1 month

git:master:498aa359: dialog: dlg_cell, always check for a to-tag match

by Julien Chavanton

Module: kamailio Branch: master Commit: 498aa35987bcfd329cf5a4879eb63888ff8ef225 URL: https://github.com/kamailio/kamailio/commit/498aa35987bcfd329cf5a4879eb6388… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-28T09:49:04-07:00 dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/498aa35987bcfd329cf5a4879eb6388… Patch: https://github.com/kamailio/kamailio/commit/498aa35987bcfd329cf5a4879eb6388… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5557e87574..93d35f553b 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -865,6 +865,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, unsigned int *dir, int mode) { struct dlg_cell *dlg; + struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; d_entry = &(d_table->entries[h_entry]); @@ -876,13 +877,24 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { ref_dlg_unsafe(dlg, 1); if(likely(mode==0)) dlg_unlock( d_table, d_entry); - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + + /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ + if (dlg->tag[1].len == 0) { + dlg_no_totag=dlg; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", + callid->len, callid->s,h_entry,*dir); + continue; + } + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", + callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + return dlg; } } if(likely(mode==0)) dlg_unlock( d_table, d_entry); + if (dlg_no_totag) return dlg_no_totag; + LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

4 years, 1 month

[kamailio/kamailio] kamailio-3.3.x-freeswitch-1.2.x-sbc I encountered 488 when using Internet (#2487)

by yuexiajiayan

i'm use it on freeswitch public ip 47.xx.xx.xx and private ip 172.31.239.38 i'm test it http://kb.asipto.com/freeswitch:kamailio-3.3.x-freeswitch-1.2.x-sbc (freeswitch.bindip= 47.xx.xx.xx ) and 101 to 100 and return 488 There seems to be no problem using it on the intranet and log: 8(21255) NOTICE: {2 26129640 INVITE b1b6df17-7ccd-1239-9990-00163e05779b} acc [acc.c:279]: acc_log_request(): ACC: call missed: timestamp=1601366864;method=INVITE;from_tag=t7jr1405ee9gp;to_tag=dGSi5k2;call_id=b1b6df17-7ccd-1239-9990-00163e05779b;code=488;reason=Not acceptable here;src_user=101;src_domain=172.31.239.38;src_ip=47.xxx.xx.xx;dst_ouser=100;dst_user=100;dst_domain=220.207.94.221 fs log: to 100 ask return INCOMPATIBLE_DESTINATION error Do you need to modify anything in the public network？ I can't find any information. Please help me? thinks -- 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/2487

4 years, 1 month

git:master:a4cc0be0: modules: readme files regenerated - topoh ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: a4cc0be07f78575fdfeae7aebfce6d37838765d6 URL: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-29T10:46:15+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… Patch: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 45e4b904d7..5f2113ef58 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -36,10 +36,12 @@ Daniel-Constantin Mierla 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] List of Examples @@ -54,7 +56,9 @@ Daniel-Constantin Mierla 1.9. Set sanity_checks parameter 1.10. Set uri_prefix_checks parameter 1.11. Set event_callback parameter - 1.12. Usage of event_route[topoh:msg-outgoing] + 1.12. Set event_mode parameter + 1.13. Usage of event_route[topoh:msg-outgoing] + 1.14. Usage of event_route[topoh:msg-sending] Chapter 1. Admin Guide @@ -79,10 +83,12 @@ Chapter 1. Admin Guide 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] 1. Overview @@ -130,6 +136,7 @@ Chapter 1. Admin Guide 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 3.1. mask_key (str) @@ -284,9 +291,23 @@ function ksr_topoh_event(evname) end ... +3.12. event_mode (int) + + Control what event_route blocks to be executed. It is a bitmask of: 1 - + execute event_route[topoh:msg-outgoing]; 2 - execute + event_route[topoh:msg-sending]. + + Default value is 3 (execute both event_route blocks). + + Example 1.12. Set event_mode parameter +... +modparam("topoh", "event_mode", 2) +... + 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] 4.1. event_route[topoh:msg-outgoing] @@ -300,7 +321,7 @@ end reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.12. Usage of event_route[topoh:msg-outgoing] + Example 1.13. Usage of event_route[topoh:msg-outgoing] ... event_route[topoh:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -308,3 +329,22 @@ event_route[topoh:msg-outgoing] { } } ... + +4.2. event_route[topoh:msg-sending] + + It is executed before doing topology hiding processing for a SIP + message to be sent out, being executed after + event_route[topoh:msg-outgoing]. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is the one to + be sent out. + + Example 1.14. Usage of event_route[topoh:msg-sending] +... +event_route[topoh:msg-sending] { + if(is_request() and $fU=="alice") { + drop; + } +} +... diff --git a/src/modules/topos/README b/src/modules/topos/README index 72b1ae8b3f..339ecd4f5d 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -265,8 +265,8 @@ end 3.9. event_mode (int) Control what event_route blocks to be executed. It is a bitmask of: 1 - - execute event_route[topos:outgoing]; 2 - execute - event_route[topos:sending]. + execute event_route[topos:msg-outgoing]; 2 - execute + event_route[topos:msg-sending]. Default value is 3 (execute both event_route blocks).

4 years, 1 month

git:master:0b4edbe9: topos: docs - fix references to event route names

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 0b4edbe967587fff3d8367c1dc301b4e22ca0949 URL: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:39:06+02:00 topos: docs - fix references to event route names --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… Patch: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 973391430b..f5d438ec1c 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -268,8 +268,8 @@ end <title><varname>event_mode</varname> (int)</title> <para> Control what event_route blocks to be executed. It is a bitmask of: - 1 - execute event_route[topos:outgoing]; 2 - execute - event_route[topos:sending]. + 1 - execute event_route[topos:msg-outgoing]; 2 - execute + event_route[topos:msg-sending]. </para> <para> <emphasis>

4 years, 1 month

git:master:e48655dd: topoh: docs for event_mode param and msg-sending event route

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e48655dd638eed8bbbd8d6087363dbdeb45a451c URL: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:35:58+02:00 topoh: docs for event_mode param and msg-sending event route --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… Patch: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 857813585b..ff98338f02 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -308,6 +308,27 @@ function ksr_topoh_event(evname) return 1; end ... +</programlisting> + </example> + </section> + <section id="topoh.p.event_mode"> + <title><varname>event_mode</varname> (int)</title> + <para> + Control what event_route blocks to be executed. It is a bitmask of: + 1 - execute event_route[topoh:msg-outgoing]; 2 - execute + event_route[topoh:msg-sending]. + </para> + <para> + <emphasis> + Default value is 3 (execute both event_route blocks). + </emphasis> + </para> + <example> + <title>Set <varname>event_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "event_mode", 2) +... </programlisting> </example> </section> @@ -315,7 +336,7 @@ end <section> <title>Event Routes</title> - <section> + <section id="topoh.e.msg_outgoing"> <title>event_route[topoh:msg-outgoing]</title> <para> It is executed before doing topology hiding processing for an outgoing @@ -339,6 +360,30 @@ event_route[topoh:msg-outgoing] { } } ... +</programlisting> + </example> + </section> + <section id="topoh.e.msg_sending"> + <title>event_route[topoh:msg-sending]</title> + <para> + It is executed before doing topology hiding processing for a SIP + message to be sent out, being executed after event_route[topoh:msg-outgoing]. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is the one + to be sent out. + </para> + <example> + <title>Usage of event_route[topoh:msg-sending]</title> + <programlisting format="linespecific"> +... +event_route[topoh:msg-sending] { + if(is_request() and $fU=="alice") { + drop; + } +} +... </programlisting> </example> </section>

4 years, 1 month

git:master:21e04744: topoh: execute msg-outgoing and msg-sending event routes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 21e04744a17522f8367e483c672adc01d836d75b URL: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:27:05+02:00 topoh: execute msg-outgoing and msg-sending event routes - similar to topos module - new event_mode modparam to control kemi callbacks execution --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0… Patch: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0…

4 years, 1 month

git:5.4:aed88c64: pv: use the corresponding functions for parsing names of xavu and xavi

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: aed88c64710493452ee3ea8468c80c3c01287111 URL: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T09:20:49+02:00 pv: use the corresponding functions for parsing names of xavu and xavi (cherry picked from commit aa8589ba66f984e93438a91a7fe8b26bd9d5b62e) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… Patch: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4d3d8b343c..ab48a54647 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -96,10 +96,10 @@ static pv_export_t mod_pvs[] = { pv_parse_xavp_name, 0, 0, 0 }, { {"xavu", sizeof("xavu")-1}, /* xavu */ PVT_XAVU, pv_get_xavu, pv_set_xavu, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavu_name, 0, 0, 0 }, { {"xavi", sizeof("xavi")-1}, /* xavi */ PVT_XAVI, pv_get_xavi, pv_set_xavi, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavi_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -1221,7 +1221,7 @@ static int w_xav_child_seti(sip_msg_t *msg, char *prname, char *pcname, return -1; } - return ki_xav_child_seti(msg, &rname, &cname, ival, _case); + return ki_xav_child_seti(msg, &rname, &cname, ival, _case); } static int w_xavp_child_seti(sip_msg_t *msg, char *prname, char *pcname, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 9510c405ba..36127a2484 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -234,7 +234,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, xavp_rm_by_index(&xname->name, idx, NULL); return 0; } - + if(xname->next->index.type==PVT_EXTRA) { /* get the index */ @@ -352,7 +352,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, return -1; return 0; } - + /* xavp with xavp list value */ if(xname->next->index.type==PVT_EXTRA) { @@ -389,7 +389,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, if(avp->val.type!=SR_XTYPE_XAVP) return -1; - + if(xname->next->index.type==PVT_EXTRA) { if(idxf1==PV_IDX_ALL) { /* ignore: should iterate and set same value to all xavps @@ -416,7 +416,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, /* add new xavp with xavp list */ if(xavp_add_value(&xname->next->name, &xval, &list)==NULL) return -1; - + /* build xavp value */ memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_XAVP; @@ -895,7 +895,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, xavu_rm_by_name(&xname->name, NULL); return 0; } - + avu = xavu_lookup(&xname->name, NULL); if(avu!=NULL && avu->val.type==SR_XTYPE_XAVP) { xavu_rm_by_name(&xname->next->name, &avu->val.v.xavp);

4 years, 1 month

git:master:aa8589ba: pv: use the corresponding functions for parsing names of xavu and xavi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aa8589ba66f984e93438a91a7fe8b26bd9d5b62e URL: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T07:25:46+02:00 pv: use the corresponding functions for parsing names of xavu and xavi --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… Patch: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4d3d8b343c..ab48a54647 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -96,10 +96,10 @@ static pv_export_t mod_pvs[] = { pv_parse_xavp_name, 0, 0, 0 }, { {"xavu", sizeof("xavu")-1}, /* xavu */ PVT_XAVU, pv_get_xavu, pv_set_xavu, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavu_name, 0, 0, 0 }, { {"xavi", sizeof("xavi")-1}, /* xavi */ PVT_XAVI, pv_get_xavi, pv_set_xavi, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavi_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -1221,7 +1221,7 @@ static int w_xav_child_seti(sip_msg_t *msg, char *prname, char *pcname, return -1; } - return ki_xav_child_seti(msg, &rname, &cname, ival, _case); + return ki_xav_child_seti(msg, &rname, &cname, ival, _case); } static int w_xavp_child_seti(sip_msg_t *msg, char *prname, char *pcname, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 9510c405ba..36127a2484 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -234,7 +234,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, xavp_rm_by_index(&xname->name, idx, NULL); return 0; } - + if(xname->next->index.type==PVT_EXTRA) { /* get the index */ @@ -352,7 +352,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, return -1; return 0; } - + /* xavp with xavp list value */ if(xname->next->index.type==PVT_EXTRA) { @@ -389,7 +389,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, if(avp->val.type!=SR_XTYPE_XAVP) return -1; - + if(xname->next->index.type==PVT_EXTRA) { if(idxf1==PV_IDX_ALL) { /* ignore: should iterate and set same value to all xavps @@ -416,7 +416,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, /* add new xavp with xavp list */ if(xavp_add_value(&xname->next->name, &xval, &list)==NULL) return -1; - + /* build xavp value */ memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_XAVP; @@ -895,7 +895,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, xavu_rm_by_name(&xname->name, NULL); return 0; } - + avu = xavu_lookup(&xname->name, NULL); if(avu!=NULL && avu->val.type==SR_XTYPE_XAVP) { xavu_rm_by_name(&xname->next->name, &avu->val.v.xavp);

4 years, 1 month

git:5.4:a6cb7427: usrloc: set last keepalive value to current time on new records

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: a6cb7427ea8d98ba10d51e1fde3648bb1aca53b6 URL: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-25T09:41:38+02:00 usrloc: set last keepalive value to current time on new records - do not rely on last modified value, can be loaded from db and be too old (cherry picked from commit 60f04b6d6f51b55294d22722df3f351a76cbfb9b) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… Patch: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 256d9530c2..95ed8d530c 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -26,8 +26,8 @@ * - Module: \ref usrloc */ -#include "ucontact.h" -#include <string.h> /* memcpy */ +#include <string.h> +#include <time.h> #include "../../core/mem/shm_mem.h" #include "../../core/ut.h" #include "../../core/ip_addr.h" @@ -129,7 +129,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->methods = _ci->methods; c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; - c->last_keepalive = _ci->last_modified; + c->last_keepalive = time(NULL); c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & ul_nat_bflag)?1:0; @@ -295,7 +295,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->cseq = _ci->cseq; _c->methods = _ci->methods; _c->last_modified = _ci->last_modified; - _c->last_keepalive = _ci->last_modified; + _c->last_keepalive = time(NULL); _c->flags = _ci->flags; _c->cflags = _ci->cflags; _c->server_id = _ci->server_id;

4 years, 1 month

← Newer
1
...
9
10
11
12
13
14
15
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020