sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

[tracker] Comment added: Fix kamalio.spec for Centos

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#493 - Fix kamalio.spec for Centos User who did this - Daniel-Constantin Mierla (miconda) ---------- Thanks for this fix. The patch is invalid as it was attached. Can you quickly re-post it, not to add the parts manually? The error is: <code> patch -p0< ~/Downloads/patch-spec.patch patching file pkg/kamailio/centos/6/kamailio.spec patch: **** malformed patch at line 21: @@ -706,7 +712,7 @@ </code> ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=493#comment1698 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

[tracker] Comment added: usrloc: REGISTER with new callid gets updated on memory but not on DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#494 - usrloc: REGISTER with new callid gets updated on memory but not on DB User who did this - Daniel-Constantin Mierla (miconda) ---------- Default value for db_ops_ruid is 1 salting with 4.2. If you tested the patch and all is ok, it can be back ported. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=494#comment1697 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

Trying to setup RTCP-XR collection for Polycom phones on Kamailio 4.2 + Homer 3.6

by A Acosta

I'm having trouble implementing this RTCP-XR collection for Polycom phones on Kamailio 4.2 I used the routing logic that comes with the homer package to accommodate some of the new features included in v3.6 This is what my kamailio.cfg looks like (the file included in /homer/configs/kamailio.cfg): # Main SIP request routing logic # - processing of any incoming SIP request starts with this route route { if($sht(a=>method::all) == $null) $sht(a=>method::all) = 0; $sht(a=>method::all) = $sht(a=>method::all) + 1; if($sht(b=>$rm::$cs::$ci) != $null) { $var(a) = "sip_capture"; sip_capture("$var(a)"); drop; } $sht(b=>$rm::$cs::$ci) = 1; if (is_method("INVITE|REGISTER")) { if($ua =~ "(friendly-scanner|sipvicious)") { sql_query("cb", "INSERT INTO alarm_data_mem (create_date, type, total, source_ip, description) VALUES(NOW(), 'scanner', 1, '$si', 'Friendly scanner alarm!') ON DUPLICATE KEY UPDATE total=total+1"); } #IP Method sql_query("cb", "INSERT INTO stats_ip_mem ( method, source_ip, total) VALUES('$rm', '$si', 1) ON DUPLICATE KEY UPDATE total=total+1"); if($au != $null) $var(anumber) = $au; else $var(anumber) = $fU; #hostname in contact if($sel(contact.uri.host) =~ "^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$") { if($sht(a=>alarm::dns) == $null) $sht(a=>alarm::dns) = 0; $sht(a=>alarm::dns) = $sht(a=>alarm::dns) + 1; } if($sel(contact.uri.host) != $si) { if($sht(a=>alarm::spoofing) == $null) $sht(a=>alarm::spoofing) = 0; $sht(a=>alarm::spoofing) = $sht(a=>alarm::spoofing) + 1; } if($au =~ "(\=)|(\-\-)|(\')|(\#)|(\%27)|(\%24)") { if($sht(a=>alarm::sqlinjection) == $null) $sht(a=>alarm::sqlinjection) = 0; $sht(a=>alarm::sqlinjection) = $sht(a=>alarm::sqlijnection) + 1; } if($(hdr(Record-Route)[0]{nameaddr.uri}) != $si) { if($sht(a=>alarm::spoofing) == $null) $sht(a=>alarm::spoofing) = 0; $sht(a=>alarm::spoofing) = $sht(a=>alarm::spoofing) + 1; } if (is_method("INVITE")) { if (has_totag()) { if($sht(a=>method::reinvite) == $null) $sht(a=>method::reinvite) = 0; $sht(a=>method::reinvite) = $sht(a=>method::reinvite) + 1; } else { if($sht(a=>method::invite) == $null) $sht(a=>method::invite) = 0; $sht(a=>method::invite) = $sht(a=>method::invite) + 1; if($adu != $null) { if($sht(a=>method::invite::auth) == $null) $sht(a=>method::invite::auth) = 0; $sht(a=>method::invite::auth) = $sht(a=>method::invite::auth) + 1; } if($ua != $null) { sql_query("cb", "INSERT INTO stats_useragent_mem (useragent, method, total) VALUES('$ua', 'INVITE', 1) ON DUPLICATE KEY UPDATE total=total+1"); } } } else { if($sht(a=>method::register) == $null) $sht(a=>method::register) = 0; $sht(a=>method::register) = $sht(a=>method::register) + 1; if($adu != $null) { if($sht(a=>method::register::auth) == $null) $sht(a=>method::register::auth) = 0; $sht(a=>method::register::auth) = $sht(a=>method::register::auth) + 1; } if($ua != $null) { sql_query("cb", "INSERT INTO stats_useragent_mem (useragent, method, total) VALUES('$ua', 'REGISTER', 1) ON DUPLICATE KEY UPDATE total=total+1"); } } } else if(is_method("BYE")) { if($sht(a=>method::bye) == $null) $sht(a=>method::bye) = 0; $sht(a=>method::bye) = $sht(a=>method::bye) + 1; if(is_present_hf("Reason") && $(hdr(Reason){param.value,cause}{s.int}) != "" ) { $var(cause) = $(hdr(Reason){param.value,cause}{s.int }); if($var(cause) != 16 && $var(cause) !=17) { if($sht(a=>stats::sdf) == $null) $sht(a=>stats::sdf) = 0; $sht(a=>stats::sdf) = $sht(a=>stats::sdf) + 1; } } } else if(is_method("CANCEL")) { if($sht(a=>method::cancel) == $null) $sht(a=>method::cancel) = 0; $sht(a=>method::cancel) = $sht(a=>method::cancel) + 1; } else if(is_method("OPTIONS")) { if($sht(a=>method::options) == $null) $sht(a=>method::options) = 0; $sht(a=>method::options) = $sht(a=>method::options) + 1; } else if(is_method("REFER")) { if($sht(a=>method::refer) == $null) $sht(a=>method::refer) = 0; $sht(a=>method::refer) = $sht(a=>method::refer) + 1; } else if(is_method("UPDATE")) { if($sht(a=>method::update) == $null) $sht(a=>method::update) = 0; $sht(a=>method::update) = $sht(a=>method::update) + 1; } $var(a) = "sip_capture"; # Kamailio 4.1 only #sip_capture("$var(a)"); sip_capture(); drop; } onreply_route { if($sht(a=>method::all) == $null) $sht(a=>method::all) = 0; $sht(a=>method::all) = $sht(a=>method::all) + 1; if($sht(b=>$rs::$cs::$rm::$ci) != $null) { $var(a) = "sip_capture"; sip_capture("$var(a)"); drop; } $sht(b=>$rs::$cs::$rm::$ci) = 1; #413 Too large if(status == "413") { if($sht(a=>alarm::413) == $null) $sht(a=>alarm::413) = 0; $sht(a=>alarm::413) = $sht(a=>alarm::413) + 1; } # Too many hops else if(status == "483") { if($sht(a=>alarm::483) == $null) $sht(a=>alarm::483) = 0; $sht(a=>alarm::483) = $sht(a=>alarm::483) + 1; } # loops else if(status == "482") { if($sht(a=>alarm::482) == $null) $sht(a=>alarm::482) = 0; $sht(a=>alarm::482) = $sht(a=>alarm::482) + 1; } # 400 else if(status == "400") { if($sht(a=>alarm::400) == $null) $sht(a=>alarm::400) = 0; $sht(a=>alarm::400) = $sht(a=>alarm::400) + 1; } # 500 else if(status == "500") { if($sht(a=>alarm::500) == $null) $sht(a=>alarm::500) = 0; $sht(a=>alarm::500) = $sht(a=>alarm::500) + 1; } # 503 else if(status == "503") { if($sht(a=>alarm::503) == $null) $sht(a=>alarm::503) = 0; $sht(a=>alarm::503) = $sht(a=>alarm::503) + 1; } # 403 else if(status == "403") { if($sht(a=>alarm::403) == $null) $sht(a=>alarm::403) = 0; $sht(a=>alarm::403) = $sht(a=>alarm::403) + 1; } # MOVED else if(status =~ "^(30[012])$") { if($sht(a=>response::300) == $null) $sht(a=>response::300) = 0; $sht(a=>response::300) = $sht(a=>response::300) + 1; } if($rm == "INVITE") { #ISA if(status =~ "^(408|50[03])$") { if($sht(a=>stats::isa) == $null) $sht(a=>stats::isa) = 0; $sht(a=>stats::isa) = $sht(a=>stats::isa) + 1; } #Bad486 if(status =~ "^(486|487|603)$") { if($sht(a=>stats::bad::invite) == $null) $sht(a=>stats::bad::invite) = 0; $sht(a=>stats::bad::invite) = $sht(a=>stats::bad::invite) + 1; } #SD if(status =~ "^(50[034])$") { if($sht(a=>stats::sd) == $null) $sht(a=>stats::sd) = 0; $sht(a=>stats::sd) = $sht(a=>stats::sd) + 1; } if(status == "407") { if($sht(a=>response::407::invite) == $null) $sht(a=>response::407::invite)= 0; $sht(a=>response::407::invite) = $sht(a=>response::407::invite) + 1; } else if(status == "401") { if($sht(a=>response::401::invite) == $null) $sht(a=>response::401::invite)= 0; $sht(a=>response::401::invite) = $sht(a=>response::401::invite) + 1; } else if(status == "200") { if($sht(a=>response::200::invite) == $null) $sht(a=>response::200::invite)= 0; $sht(a=>response::200::invite) = $sht(a=>response::200::invite) + 1; } } else if($rm == "BYE") { if(status == "407") { if($sht(a=>response::407::bye) == $null) $sht(a=>response::407::bye) = 0; $sht(a=>response::407::bye) = $sht(a=>response::407::bye) + 1; } else if(status == "401") { if($sht(a=>response::401::bye) == $null) $sht(a=>response::401::bye) = 0; $sht(a=>response::401::bye) = $sht(a=>response::401::bye) + 1; } else if(status == "200") { if($sht(a=>response::200::bye) == $null) $sht(a=>response::200::bye) = 0; $sht(a=>response::200::bye) = $sht(a=>response::200::bye) + 1; } } sip_capture(); drop; } route[TIMER_STATS] { xlog("timer routine: time is $TS\n"); #ALARM SCANNERS sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, source_ip, description) SELECT create_date, type, total, source_ip, description FROM alarm_data_mem;"); sql_query("cb", "TRUNCATE TABLE alarm_data_mem"); #413 if($sht(a=>alarm::413) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 413', $sht(a=>alarm::413), 'Too many big messages')"); } $sht(a=>alarm::413) = 0; #483 if($sht(a=>alarm::483) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 483', $sht(a=>alarm::483), 'Too many hops messages')"); } $sht(a=>alarm::483) = 0; #482 if($sht(a=>alarm::482) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 482', $sht(a=>alarm::482), 'Too many loops messages')"); } $sht(a=>alarm::482) = 0; #403 if($sht(a=>alarm::403) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 403', $sht(a=>alarm::403), 'fraud alarm')"); } $sht(a=>alarm::403) = 0; #503 if($sht(a=>alarm::503) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 503', $sht(a=>alarm::503), 'service unavailable')"); } $sht(a=>alarm::503) = 0; #500 if($sht(a=>alarm::500) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 500', $sht(a=>alarm::500), 'server errors')"); } $sht(a=>alarm::500) = 0; #408 if($sht(a=>alarm::408) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 408', $sht(a=>alarm::408), 'Timeout')"); } $sht(a=>alarm::408) = 0; #400 if($sht(a=>alarm::400) > 0) { sql_query("cb", "INSERT INTO alarm_data (create_date, type, total, description) VALUES(NOW(), 'Too Many 400', $sht(a=>alarm::400), 'Too many bad request')"); } $sht(a=>alarm::400) = 0; #delete old alarms sql_query("cb", "DELETE FROM alarm_data WHERE create_date < DATE_SUB(NOW(), INTERVAL 5 DAY)"); #SQL STATS $var(tm) = ($time(min) mod 10); if($var(tm) != 0 && $var(tm) != 5) return; $var(t1) = $TS; $var(t2) = $var(t1) - 300; xlog("TIME : $var(tm)\n"); $var(t_date) = "FROM_UNIXTIME(" + $var(t1) + ", '%Y-%m-%d %H:%i:00')"; $var(f_date) = "FROM_UNIXTIME(" + $var(t2) + ", '%Y-%m-%d %H:%i:00')"; #STATS Useragent sql_query("cb", "INSERT INTO stats_useragent (from_date, to_date, useragent, method, total) SELECT $var(f_date) as from_date, $var(t_date) as to_date, useragent, method, total FROM stats_useragent_mem;"); sql_query("cb", "TRUNCATE TABLE stats_useragent_mem"); #STATS IP sql_query("cb", "INSERT INTO stats_ip (from_date, to_date, method, source_ip, total) SELECT $var(f_date) as from_date, $var(t_date) as to_date, method, source_ip, total FROM stats_ip_mem;"); sql_query("cb", "TRUNCATE TABLE stats_ip_mem"); #INSERT SQL STATS #SDF if($sht(a=>stats::sdf) != $null && $sht(a=>stats::sdf) > 0) { sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'sdf', $sht(a=>stats::sdf))"); $sht(a=>stats::sdf) = 0; } #ISA if($sht(a=>stats::isa) != $null && $sht(a=>stats::isa) > 0) { sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'isa', $sht(a=>stats::isa))"); $sht(a=>stats::isa) = 0; } #SD if($sht(a=>stats::sd) != $null && $sht(a=>stats::sd) > 0) { sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'isa', $sht(a=>stats::sd))"); $sht(a=>stats::sd) = 0; } #SSR if($sht(a=>stats::ssr) != $null && $sht(a=>stats::ssr) > 0) { sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'ssr', $sht(a=>stats::ssr))"); $sht(a=>stats::ssr) = 0; } #ASR $var(asr) = 0; #if($sht(a=>response::200::invite) > 0) { if($sht(a=>method::invite) > 0) { if($sht(a=>response::407::invite) == $null) $sht(a=>response::407::invite) = 0; if($sht(a=>response::200::invite) == $null) $sht(a=>response::200::invite) = 0; $var(d) = $sht(a=>method::invite) - $sht(a=>response::407::invite); if($var(d) > 0) { $var(asr) = $sht(a=>response::200::invite) / $var(d) * 100; if($var(asr) > 100) $var(asr) = 100; } } #Stats DATA sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'asr', $var(asr))"); #NER $var(ner) = 0; #if($sht(a=>response::200::invite) > 0 || $sht(a=>stats::bad::invite) > 0) { if($sht(a=>method::invite) > 0) { if($sht(a=>response::200::invite) == $null) $sht(a=>response::200::invite) = 0; if($sht(a=>response::bad::invite) == $null) $sht(a=>response::bad::invite) = 0; if($sht(a=>response::407::invite) == $null) $sht(a=>response::407::invite) = 0; $var(d) = $sht(a=>method::invite) - $sht(a=>response::407::invite); if($var(d) > 0) { $var(ner) = ($sht(a=>response::200::invite) + $sht(a=>stats::bad::invite)) / $var(d) * 100; if($var(ner) > 100) $var(ner) = 100; } } sql_query("cb", "INSERT INTO stats_data (from_date, to_date, type, total) VALUES($var(f_date), $var(t_date), 'ner', $var(ner))"); #INVITE if($sht(a=>method::reinvite) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, totag, total) VALUES($var(f_date), $var(t_date),'INVITE', 1, $sht(a=>method::reinvite))"); $sht(a=>method::reinvite) = 0; } #INVITE if($sht(a=>method::invite) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'INVITE', $sht(a=>method::invite))"); $sht(a=>method::invite) = 0; } #INVITE AUTH if($sht(a=>method::invite::auth) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, auth, total) VALUES($var(f_date), $var(t_date), 'INVITE', 1, $sht(a=>method::invite::auth))"); $sht(a=>method::invite::auth) = 0; } #REGISTER if($sht(a=>method::register) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'REGISTER', $sht(a=>method::register))"); $sht(a=>method::register) = 0; } #REGISTER AUTH if($sht(a=>method::register::auth) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, auth, total) VALUES($var(f_date), $var(t_date), 'REGISTER', 1, $sht(a=>method::register::auth))"); $sht(a=>method::register::auth) = 0; } #BYE if($sht(a=>method::bye) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'BYE', $sht(a=>method::bye))"); $sht(a=>method::bye) = 0; } #CANCEL if($sht(a=>method::cancel) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'CANCEL', $sht(a=>method::cancel))"); $sht(a=>method::cancel) = 0; } #OPTIONS if($sht(a=>method::options) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'OPTIONS', $sht(a=>method::options))"); $sht(a=>method::options) = 0; } #REFER if($sht(a=>method::refer) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'REFER', $sht(a=>method::refer))"); $sht(a=>method::refer) = 0; } #UPDATE if($sht(a=>method::update) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'UPDATE', $sht(a=>method::update))"); $sht(a=>method::update) = 0; } #RESPONSE #300 if($sht(a=>response::300) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), '300', $sht(a=>response::300))"); $sht(a=>response::300) = 0; } #407 INVITE if($sht(a=>response::407::invite) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '407', 'INVITE', $sht(a=>response::407::invite))"); $sht(a=>response::407::invite) = 0; } #401 INVITE if($sht(a=>response::401::invite) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '401', 'INVITE', $sht(a=>response::401::invite))"); $sht(a=>response::401::invite) = 0; } #200 INVITE if($sht(a=>response::200::invite) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '200', 'INVITE', $sht(a=>response::200::invite))"); $sht(a=>response::200::invite) = 0; } #407 BYE if($sht(a=>response::407::bye) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '407', 'BYE', $sht(a=>response::407::bye))"); $sht(a=>response::407::bye) = 0; } #401 BYE if($sht(a=>response::401::bye) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '401', 'BYE', $sht(a=>response::401::bye))"); $sht(a=>response::401::bye) = 0; } #200 BYE if($sht(a=>response::200::bye) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, cseq, total) VALUES($var(f_date), $var(t_date), '200', 'BYE', $sht(a=>response::200::bye))"); $sht(a=>response::200::bye) = 0; } #ALL MESSAGES if($sht(a=>method::all) > 0) { sql_query("cb", "INSERT INTO stats_method (from_date, to_date, method, total) VALUES($var(f_date), $var(t_date), 'ALL', $sht(a=>method::all))"); $sht(a=>method::all) = 0; } } I managed to get this working with Opensips with the help of the following link: http://wiki.sipfoundry.org/display/sipXecs/Setting+up+an+RTCP-XR+collector+… However, Kamailio's routing logic syntax is different and I'm having a hard time parsing through it. This is what the RTCP-XR collection logic looks like in the Opensips routing logic: # main request routing logic route{ #For example, you can capture only needed methods... if (method =~ "^(INVITE|ACK|CANCEL|BYE|REFER|PRACK|UPDATE)") { sip_capture(); } else if (method =~ "^PUBLISH" && !$ct =~ "x-sipX-nonat" && $rd = " domain.com" ) { #xlog("$rd================================="); perl_exec("messagedump"); t_reply("200","PUBLISH RECORDED"); } exit; } onreply_route { #And only needed reply or needed requests method if(status =~ "^(1[0-9][0-9]|[3[0-9][0-9]|4[0-9]|[56][0-9][0-9])") { if($rm =~ "^(INVITE|ACK|CANCEL|BYE|REFER|PRACK|UPDATE)") { sip_capture(); } exit; } } Any help would be appreciated. -- *Ashlin Jones-Acosta* Telephony Systems Engineer Infrastructure Technology Direct: (805) 222-0934 *PennyMac*

10 years

[tracker] User took ownership: usrloc: REGISTER with new callid gets updated on memory but not on DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#494 - usrloc: REGISTER with new callid gets updated on memory but not on DB More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=494 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

git:master: usrloc: fix db_update_addr and db_delete_ucontact_addr

by Victor Seva

Module: sip-router Branch: master Commit: e8a795a6a413ae453f619e3deaf36c26b85b0077 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8a795a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Mon Nov 24 14:48:16 2014 +0100 usrloc: fix db_update_addr and db_delete_ucontact_addr use query WHERE columns depending on matching_mode option --- modules/usrloc/ucontact.c | 214 ++++++++++++++++++++++++++++++--------------- 1 files changed, 143 insertions(+), 71 deletions(-) diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 5360e3d..b0cbb28 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -674,33 +674,17 @@ int db_update_ucontact_addr(ucontact_t* _c) char* dom; db_key_t keys1[4]; db_val_t vals1[4]; - int n1; + int n1 = 0; - db_key_t keys2[15]; - db_val_t vals2[15]; - int nr_cols2; + db_key_t keys2[16]; + db_val_t vals2[16]; + int nr_cols2 = 0; if (_c->flags & FL_MEM) { return 0; } - keys2[0] = &expires_col; - keys2[1] = &q_col; - keys2[2] = &cseq_col; - keys2[3] = &flags_col; - keys2[4] = &cflags_col; - keys2[5] = &user_agent_col; - keys2[6] = &received_col; - keys2[7] = &path_col; - keys2[8] = &sock_col; - keys2[9] = &methods_col; - keys2[10] = &last_mod_col; - keys2[11] = &ruid_col; - keys2[12] = &instance_col; - keys2[13] = &reg_id_col; - - n1 = 0; keys1[n1] = &user_col; vals1[n1].type = DB1_STR; vals1[n1].nul = 0; @@ -715,72 +699,138 @@ int db_update_ucontact_addr(ucontact_t* _c) LM_DBG("contact:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); n1++; - keys1[n1] = &callid_col; - vals1[n1].type = DB1_STR; - vals1[n1].nul = 0; - vals1[n1].val.str_val = _c->callid; - LM_DBG("callid:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); - n1++; + switch (matching_mode) { + case CONTACT_ONLY: + /* update call-id */ + keys2[nr_cols2] = &callid_col; + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->callid; + nr_cols2++; + /* update path */ + keys2[nr_cols2] = &path_col; + vals2[nr_cols2].type = DB1_STR; + if (_c->path.s == 0) { + vals2[nr_cols2].nul = 1; + } else { + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->path; + } + nr_cols2++; + break; + case CONTACT_CALLID: + keys1[n1] = &callid_col; + vals1[n1].type = DB1_STR; + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->callid; + LM_DBG("callid:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); + n1++; + /* update path */ + keys2[nr_cols2] = &path_col; + vals2[nr_cols2].type = DB1_STR; + if (_c->path.s == 0) { + vals2[nr_cols2].nul = 1; + } else { + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->path; + } + nr_cols2++; + break; + case CONTACT_PATH: + keys1[n1] = &path_col; + vals1[n1].type = DB1_STR; + if (_c->path.s == 0) { + vals1[n1].nul = 1; + LM_DBG("path: NULL\n"); + } else { + vals1[n1].nul = 0; + vals1[n1].val.str_val = _c->path; + LM_DBG("path:%.*s\n", vals1[n1].val.str_val.len, vals1[n1].val.str_val.s); + } + n1++; + /* update call-id */ + keys2[nr_cols2] = &callid_col; + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->callid; + nr_cols2++; + break; + default: + LM_CRIT("unknown matching_mode %d\n", matching_mode); + return -1; + } - vals2[0].nul = 0; - UL_DB_EXPIRES_SET(&vals2[0], _c->expires); + keys2[nr_cols2] = &expires_col; + vals2[nr_cols2].nul = 0; + UL_DB_EXPIRES_SET(&vals2[nr_cols2], _c->expires); + nr_cols2++; - vals2[1].type = DB1_DOUBLE; - vals2[1].nul = 0; - vals2[1].val.double_val = q2double(_c->q); + keys2[nr_cols2] = &q_col; + vals2[nr_cols2].type = DB1_DOUBLE; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.double_val = q2double(_c->q); + nr_cols2++; - vals2[2].type = DB1_INT; - vals2[2].nul = 0; - vals2[2].val.int_val = _c->cseq; + keys2[nr_cols2] = &cseq_col; + vals2[nr_cols2].type = DB1_INT; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.int_val = _c->cseq; + nr_cols2++; - vals2[3].type = DB1_INT; - vals2[3].nul = 0; - vals2[3].val.bitmap_val = _c->flags; + keys2[nr_cols2] = &flags_col; + vals2[nr_cols2].type = DB1_INT; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.bitmap_val = _c->flags; + nr_cols2++; - vals2[4].type = DB1_INT; - vals2[4].nul = 0; - vals2[4].val.bitmap_val = _c->cflags; + keys2[nr_cols2] = &cflags_col; + vals2[nr_cols2].type = DB1_INT; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.bitmap_val = _c->cflags; + nr_cols2++; - vals2[5].type = DB1_STR; - vals2[5].nul = 0; - vals2[5].val.str_val = _c->user_agent; + keys2[nr_cols2] = &user_agent_col; + vals2[nr_cols2].type = DB1_STR; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->user_agent; + nr_cols2++; - vals2[6].type = DB1_STR; + keys2[nr_cols2] = &received_col; + vals2[nr_cols2].type = DB1_STR; if (_c->received.s == 0) { - vals2[6].nul = 1; - } else { - vals2[6].nul = 0; - vals2[6].val.str_val = _c->received; - } - - vals2[7].type = DB1_STR; - if (_c->path.s == 0) { - vals2[7].nul = 1; + vals2[nr_cols2].nul = 1; } else { - vals2[7].nul = 0; - vals2[7].val.str_val = _c->path; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val.str_val = _c->received; } + nr_cols2++; - vals2[8].type = DB1_STR; + keys2[nr_cols2] = &sock_col; + vals2[nr_cols2].type = DB1_STR; if (_c->sock) { - vals2[8].val.str_val = _c->sock->sock_str; - vals2[8].nul = 0; + vals2[nr_cols2].val.str_val = _c->sock->sock_str; + vals2[nr_cols2].nul = 0; } else { - vals2[8].nul = 1; + vals2[nr_cols2].nul = 1; } + nr_cols2++; - vals2[9].type = DB1_BITMAP; + keys2[nr_cols2] = &methods_col; + vals2[nr_cols2].type = DB1_BITMAP; if (_c->methods == 0xFFFFFFFF) { - vals2[9].nul = 1; + vals2[nr_cols2].nul = 1; } else { - vals2[9].val.bitmap_val = _c->methods; - vals2[9].nul = 0; + vals2[nr_cols2].val.bitmap_val = _c->methods; + vals2[nr_cols2].nul = 0; } + nr_cols2++; - vals2[10].nul = 0; - UL_DB_EXPIRES_SET(&vals2[10], _c->last_modified); + keys2[nr_cols2] = &last_mod_col; + vals2[nr_cols2].nul = 0; + vals2[nr_cols2].val = _c->last_modified; + nr_cols2++; - nr_cols2 = 11; + keys2[nr_cols2] = &ruid_col; if(_c->ruid.len>0) { vals2[nr_cols2].type = DB1_STR; @@ -791,6 +841,7 @@ int db_update_ucontact_addr(ucontact_t* _c) } nr_cols2++; + keys2[nr_cols2] = &instance_col; if(_c->instance.len>0) { vals2[nr_cols2].type = DB1_STR; @@ -801,6 +852,7 @@ int db_update_ucontact_addr(ucontact_t* _c) } nr_cols2++; + keys2[nr_cols2] = &reg_id_col; vals2[nr_cols2].type = DB1_INT; vals2[nr_cols2].nul = 0; vals2[nr_cols2].val.int_val = (int)_c->reg_id; @@ -1318,11 +1370,31 @@ int db_delete_ucontact_addr(ucontact_t* _c) vals[n].val.str_val = _c->c; n++; - keys[n] = &callid_col; - vals[n].type = DB1_STR; - vals[n].nul = 0; - vals[n].val.str_val = _c->callid; - n++; + switch (matching_mode) { + case CONTACT_ONLY: + break; + case CONTACT_CALLID: + keys[n] = &callid_col; + vals[n].type = DB1_STR; + vals[n].nul = 0; + vals[n].val.str_val = _c->callid; + n++; + break; + case CONTACT_PATH: + keys[n] = &path_col; + vals[n].type = DB1_STR; + if (_c->path.s == 0) { + vals[n].nul = 1; + } else { + vals[n].nul = 0; + vals[n].val.str_val = _c->path; + } + n++; + break; + default: + LM_CRIT("unknown matching_mode %d\n", matching_mode); + return -1; + } if (use_domain) { keys[n] = &domain_col;

10 years

[tracker] Comment added: usrloc: REGISTER with new callid gets updated on memory but not on DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#494 - usrloc: REGISTER with new callid gets updated on memory but not on DB User who did this - Víctor Seva (linuxmaniac) ---------- > What version are you using? Have you tried with db_ops_ruid parameter set to 1? This was reported for 4.1.6. No, I did not tried with db_ops_ruid = 1. > The patch is good anyhow to solve the old db operations mode, you can commit it. I'm going to commit this to master. I think this should be backported to 4.1/4.2 too. > In long term, the db update/delete operations should be done on ruid only, the other options should be removed – they are costly due to mach value size (e.g., when someone has a long path set). Should we change the default value of db_ops_ruid as a first step? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=494#comment1696 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

[tracker] Comment added: usrloc: REGISTER with new callid gets updated on memory but not on DB

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#494 - usrloc: REGISTER with new callid gets updated on memory but not on DB User who did this - Daniel-Constantin Mierla (miconda) ---------- What version are you using? Have you tried with db_ops_ruid parameter set to 1? The patch is good anyhow to solve the old db operations mode, you can commit it. In long term, the db update/delete operations should be done on ruid only, the other options should be removed -- they are costly due to mach value size (e.g., when someone has a long path set). ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=494#comment1695 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

[tracker] Task opened: usrloc: REGISTER with new callid gets updated on memory but not on DB (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - usrloc: REGISTER with new callid gets updated on memory but not on DB Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - First REGISTER with callid X gets registered with no problem ( mem and db are in sync ) If the UAC send a new REGISTER before getting expire and this new REGISTER has a different callid in memory the register is OK but on DB the register is never updated. The main problem in my opinion is that we don't obey the match_option at db_update_ucontact_addr nor db_delete_ucontact_addr. the callid is in the where part of the query. One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=494 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

10 years

RFC: infrastructure upgrade - git, tracker, ...

by Daniel-Constantin Mierla

Hello, as most of you know, we have a rather distributed infrastructure, with servers provided from different companies or persons. We came to the time when one of the servers is too old and considered to be decommisioned, so we have to decide how to move on. It is about sip-router.org, who was offered/sponsored by courtesy of Jan Janak. From project point of view, the server hosts: - git repository - bug tracker - website and wiki under domain sip-router.org Given that no matter what we like, there is work to do, I am looking to see what are the best options out there for everyone involved in the project. The sip-router.or wbesite and wiki, which are not really updated anyhow, will be relocated as virtual host in kamailio.org server and made static for historic purposes. For git and tracker, I thought of two variants: 1) move to use an external hosting service - the first candidate and perhaps the only to be considered is GitHub, we have there already a real time mirror of git repository. Then we should get a read only mirror to kamailio.org. If the tracker on github is good enough for everyone, then we will use it. I could see quickly that lot of kamailio developers already have an account on github. 2) get a new server and relocate those components there. It will need to be configured from scratch and the components eventually updated to use latest versions. In case of tracker, we have eventually to re-evaluate if flyspray worth keeping, as we had several discussions, due to the fact that the project doesn't seem to be very active. My personal preference at this moment is 1), given that offloads administration works from project. For 2) we will need someone to commit to a sysadmin job for long time. As probably you noticed lately, serious security vulnerabilities can appear and someone needs to take care of proper maintenance of the server. I don't want to get all services on kamailio.org, as it has other critical components (mailing lists, releases, website, ...) and messing it or overloading doesn't make sense. There is no real pressure to come to a decision, we can still rely on the server for a while, but I would rather not postpone it for long. While users are encouraged to give their opinion, I feel that existing developers should have the main role in decision, being something that impacts them directly. Your preference? Any other opinions? Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Nov 24-27, Berlin - http://www.asipto.com

10 years

git:master: modules/ims_registrar_scscf: Send full notify for all SUBSCRIBE, not just first one

by Richard Good

Module: sip-router Branch: master Commit: d0b1d97151c778745df2afbd5f1fcd6b15f8171e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d0b1d97… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Fri Nov 21 11:46:47 2014 +0200 modules/ims_registrar_scscf: Send full notify for all SUBSCRIBE, not just first one --- modules/ims_registrar_scscf/registrar_notify.c | 25 +++++++---------------- 1 files changed, 8 insertions(+), 17 deletions(-) diff --git a/modules/ims_registrar_scscf/registrar_notify.c b/modules/ims_registrar_scscf/registrar_notify.c index 7cc2677..8638a4a 100644 --- a/modules/ims_registrar_scscf/registrar_notify.c +++ b/modules/ims_registrar_scscf/registrar_notify.c @@ -915,7 +915,6 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { reg_subscriber *reg_subscriber; subscriber_data_t subscriber_data; - int new_subscription = 1; int event_type = IMS_REGISTRAR_NONE; int rt = 0; @@ -1106,10 +1105,6 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { ret = CSCF_RETURN_FALSE; goto error; } - //send full update on first registration - - new_subscription = 1; - } else { if(memcmp(reg_subscriber->call_id.s, subscriber_data.callid->s, reg_subscriber->call_id.len) == 0 && @@ -1123,7 +1118,6 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { ret = CSCF_RETURN_FALSE; goto error; } - new_subscription = 0; } else { LM_ERR("Re-subscribe for same watcher_contact, presentity_uri, event but with different callid, fromtag and totag - What happened?\n"); LM_DBG("Removing old subscriber and adding new one\n"); @@ -1136,7 +1130,6 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { ret = CSCF_RETURN_FALSE; goto error; } - new_subscription = 1; } } @@ -1146,16 +1139,14 @@ int subscribe_to_reg(struct sip_msg *msg, char *_t, char *str2) { LM_DBG("Sending 200 OK to subscribing user"); subscribe_reply(msg, 200, MSG_REG_SUBSCRIBE_OK, &expires, &scscf_name_str); - //only do reg event on new subscriptions - if (new_subscription) { - if (event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact) != 0) { - LM_ERR("failed adding notification for reg events\n"); - ret = CSCF_RETURN_ERROR; - goto error; - } else { - LM_DBG("success adding notification for reg events\n"); - } - } + //do reg event every time you get a subscribe + if (event_reg(domain, 0, 0, event_type, &presentity_uri, &watcher_contact) != 0) { + LM_ERR("failed adding notification for reg events\n"); + ret = CSCF_RETURN_ERROR; + goto error; + } else { + LM_DBG("success adding notification for reg events\n"); + } } else { event_type = IMS_REGISTRAR_UNSUBSCRIBE; LM_DBG("expires is zero or less - UNSUBSCRIBE");

10 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014