sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
539 discussions

[kamailio/kamailio] CSeq issues with CANCEL after INVITE (#918)
by greggcz 12 Jan '17

12 Jan '17

Hi, I have a provider that requires proxy auth for all outgoing calls so I create the following config: ``` loadmodule "uac.so" loadmodule "dialog.so" modparam("dialog", "dlg_flag", 4) modparam("dialog", "track_cseq_updates", 1) modparam("dialog", "send_bye", 1) modparam("dialog", "timeout_noreset", 1) modparam("uac","auth_realm_avp","$avp(s:auth_realm_avp)") modparam("uac","auth_username_avp","$avp(s:auth_username_avp)") modparam("uac","auth_password_avp","$avp(s:auth_password_avp)") route { ...... dlg_manage(); # dispatch destinations to PSTN route(PSTN); ...... } failure_route[MANAGE_FAILURE] { route(NATMANAGE); if (t_is_canceled()) { exit; } if (t_check_status("401|407")) { $avp(s:auth_realm_avp) = "realm"; $avp(s:auth_username_avp) = "user"; $avp(s:auth_password_avp) = "pass"; if (uac_auth()) { xlog("L_INFO", "[MANAGE_FAILURE] did auth. Relaying to new destination. from=$fu, callee-selected-by=$ou, uri=$ru"); t_relay(); exit; } else { xlog("L_INFO", "[MANAGE_FAILURE] no matching realm found. realm=$ar"); } } } ``` Based on this authentication happens correctly however when canceling the call from the caller side, incorrect CSeq value is sent to the PSTN trunk: INVITE sip:48221028000@__provider__:6050 SIP/2.0 Record-Route: <sip:x.x.216.50;lr=on;ftag=327099285;did=14e.8df> Max-Forwards: 19 Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.0 Via: SIP/2.0/UDP x.x.219.61:1049;received=x.x.219.61;rport=1049;branch=z9hG4bK1237457362 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50> Call-ID: 1015351791(a)x.x.216.50 Allow: ACK, INVITE, BYE, CANCEL, OPTIONS, INFO CSeq: 74 INVITE Content-Type: application/sdp Content-Length: 481 v=0 o=yate 1483794545 1483794545 IN IP4 x.x.219.61 s=SIP Call c=IN IP4 x.x.219.61 t=0 0 m=audio 21596 RTP/AVP 0 8 11 98 97 102 103 104 105 106 101 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:11 L16/8000 a=rtpmap:98 iLBC/8000 a=fmtp:98 mode=20 a=rtpmap:97 iLBC/8000 a=fmtp:97 mode=30 a=rtpmap:102 SPEEX/8000 a=rtpmap:103 SPEEX/16000 a=rtpmap:104 SPEEX/32000 a=rtpmap:105 iSAC/16000 a=rtpmap:106 iSAC/32000 a=rtpmap:101 telephone-event/8000 a=ptime:30 SIP/2.0 407 Proxy Authentication Required Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.0;received=x.x.216.50 Via: SIP/2.0/UDP x.x.219.61:1049;received=x.x.219.61;rport=1049;branch=z9hG4bK1237457362 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50>;tag=as386df8c6 Call-ID: 1015351791(a)x.x.216.50 CSeq: 74 INVITE User-Agent: Adescom CTM5000 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO Max-Forwards: 70 Proxy-Authenticate: Digest realm="adescom", nonce="080cd7c6" Content-Length: 0 ACK sip:48221028000@__provider__:6050 SIP/2.0 Max-Forwards: 19 Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.0 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50>;tag=as386df8c6 Call-ID: 1015351791(a)x.x.216.50 CSeq: 74 ACK Content-Length: 0 INVITE sip:48221028000@__provider__:6050 SIP/2.0 Record-Route: <sip:x.x.216.50;lr=on;ftag=327099285;did=14e.8df> Max-Forwards: 19 Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.1.cs74 Via: SIP/2.0/UDP x.x.219.61:1049;received=x.x.219.61;rport=1049;branch=z9hG4bK1237457362 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50> Call-ID: 1015351791(a)x.x.216.50 Allow: ACK, INVITE, BYE, CANCEL, OPTIONS, INFO CSeq: 75 INVITE Content-Type: application/sdp Content-Length: 481 Proxy-Authorization: Digest username="___USER___", realm="adescom", nonce="080cd7c6", uri="sip:48221028000@__provider__:6050", response="521afedacdfa7033339e4956580bb0ec", algorithm=MD5 v=0 o=yate 1483794545 1483794545 IN IP4 x.x.219.61 s=SIP Call c=IN IP4 x.x.219.61 t=0 0 m=audio 21596 RTP/AVP 0 8 11 98 97 102 103 104 105 106 101 a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:11 L16/8000 a=rtpmap:98 iLBC/8000 a=fmtp:98 mode=20 a=rtpmap:97 iLBC/8000 a=fmtp:97 mode=30 a=rtpmap:102 SPEEX/8000 a=rtpmap:103 SPEEX/16000 a=rtpmap:104 SPEEX/32000 a=rtpmap:105 iSAC/16000 a=rtpmap:106 iSAC/32000 a=rtpmap:101 telephone-event/8000 a=ptime:30 SIP/2.0 100 Trying Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.1.cs74;received=x.x.216.50 Via: SIP/2.0/UDP x.x.219.61:1049;received=x.x.219.61;rport=1049;branch=z9hG4bK1237457362 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50> Call-ID: 1015351791(a)x.x.216.50 CSeq: 75 INVITE User-Agent: Adescom CTM5000 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO Max-Forwards: 70 Contact: <sip:48221028000@85.14.79.130:6050> Content-Length: 0 X-CTMG-HangupCause: Normal Clearing SIP/2.0 183 Session Progress Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.1.cs74;received=x.x.216.50 Via: SIP/2.0/UDP x.x.219.61:1049;received=x.x.219.61;rport=1049;branch=z9hG4bK1237457362 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50>;tag=as1fa0d5d0 Call-ID: 1015351791(a)x.x.216.50 CSeq: 75 INVITE User-Agent: Adescom CTM5000 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO Max-Forwards: 70 Contact: <sip:48221028000@85.14.79.130:6050> Content-Type: application/sdp Content-Length: 226 v=0 o=root 7839 7839 IN IP4 85.14.79.130 s=session c=IN IP4 85.14.79.130 t=0 0 m=audio 30688 RTP/AVP 8 101 a=rtpmap:8 PCMA/8000 a=ptime:20 a=rtpmap:101 telephone-event/8000 a=fmtp:101 0-16 a=silenceSupp:off - - - - CANCEL sip:48221028000@__provider__:6050 SIP/2.0 Max-Forwards: 19 Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.1 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50> Call-ID: 1015351791(a)x.x.216.50 CSeq: 74 CANCEL Content-Length: 0 SIP/2.0 500 Server error Via: SIP/2.0/UDP x.x.216.50;branch=z9hG4bKa108.115652a5d470ecc5427124e7926af3b2.1;received=x.x.216.50 From: <sip:48221028008@x.x.216.50>;tag=327099285 To: <sip:48221028000@x.x.216.50>;tag=as1fa0d5d0 Call-ID: 1015351791(a)x.x.216.50 CSeq: 74 CANCEL User-Agent: Adescom CTM5000 Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY, INFO Max-Forwards: 70 Content-Length: 0 X-CTMG-HangupCause: Normal Clearing Since I'm new to Kamailio, I figured I must be doing something wrong but don't seem to find any working example anywhere.... -G -- 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/918

2 13

git:master:14699865: tm: more log macros migrated from old form with location info in message
by Daniel-Constantin Mierla 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: 1469986560218d4704913e635e7a1298305af799 URL: https://github.com/kamailio/kamailio/commit/1469986560218d4704913e635e7a129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-12T17:17:04+01:00 tm: more log macros migrated from old form with location info in message - they are added automatically - code indentation coherence with clang format --- Modified: src/modules/tm/h_table.c Modified: src/modules/tm/h_table.h Modified: src/modules/tm/lock.c Modified: src/modules/tm/lock.h Modified: src/modules/tm/lw_parser.c Modified: src/modules/tm/lw_parser.h Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1469986560218d4704913e635e7a129… Patch: https://github.com/kamailio/kamailio/commit/1469986560218d4704913e635e7a129…

1 0

git:master:fab1b5dc: dialog: handle replies to local cancel for cseq updates
by Daniel-Constantin Mierla 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: fab1b5dc4edc74555b965a6c305d7643629e0225 URL: https://github.com/kamailio/kamailio/commit/fab1b5dc4edc74555b965a6c305d764… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-12T16:35:18+01:00 dialog: handle replies to local cancel for cseq updates --- Modified: src/modules/dialog/dlg_cseq.c --- Diff: https://github.com/kamailio/kamailio/commit/fab1b5dc4edc74555b965a6c305d764… Patch: https://github.com/kamailio/kamailio/commit/fab1b5dc4edc74555b965a6c305d764… --- diff --git a/src/modules/dialog/dlg_cseq.c b/src/modules/dialog/dlg_cseq.c index 41c9864..98fae28 100644 --- a/src/modules/dialog/dlg_cseq.c +++ b/src/modules/dialog/dlg_cseq.c @@ -78,25 +78,24 @@ static int dlg_cseq_prepare_msg(sip_msg_t *msg) /* reply to local transaction -- nothing to do */ if (parse_headers(msg, HDR_VIA2_F, 0)==-1 || (msg->via2==0) || (msg->via2->error!=PARSE_OK)) { - LM_DBG("no second via in this message \n"); - return 3; + if(get_cseq(msg)->method_id != METHOD_CANCEL) { + LM_DBG("no second via in this message \n"); + return 3; + } } } - if(parse_from_header(msg)<0) - { + if(parse_from_header(msg)<0) { LM_ERR("cannot parse FROM header\n"); return 3; } - if(parse_to_header(msg)<0 || msg->to==NULL) - { + if(parse_to_header(msg)<0 || msg->to==NULL) { LM_ERR("cannot parse TO header\n"); return 3; } - if(get_to(msg)==NULL) - { + if(get_to(msg)==NULL) { LM_ERR("cannot get TO header\n"); return 3; }

1 0

git:master:3a81cd7b: xhttp_pi: fix compiler warning
by Victor Seva 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: 3a81cd7b2dc0b9a5c540a54c34413360d6d076b9 URL: https://github.com/kamailio/kamailio/commit/3a81cd7b2dc0b9a5c540a54c3441336… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-12T16:22:31+01:00 xhttp_pi: fix compiler warning > xhttp_pi_fnc.c: In function 'ph_init_cmds': > xhttp_pi_fnc.c:1922:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if(doc)xmlFree(doc);doc=NULL; > ^~ > xhttp_pi_fnc.c:1922:23: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > if(doc)xmlFree(doc);doc=NULL; > ^~~ > xhttp_pi_fnc.c:1942:3: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if(doc)xmlFree(doc);doc=NULL; > ^~ > xhttp_pi_fnc.c:1942:23: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > if(doc)xmlFree(doc);doc=NULL; > ^~~ > xhttp_pi_fnc.c:1950:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if(doc)xmlFree(doc);doc=NULL; > ^~ > xhttp_pi_fnc.c:1950:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > if(doc)xmlFree(doc);doc=NULL; > ^~~ > xhttp_pi_fnc.c:1961:2: warning: this 'if' clause does not guard... [-Wmisleading-indentation] > if(doc)xmlFree(doc);doc=NULL; > ^~ > xhttp_pi_fnc.c:1961:22: note: ...this statement, but the latter is misleadingly indented as if it is guarded by the 'if' > if(doc)xmlFree(doc);doc=NULL; > ^~~ --- Modified: src/modules/xhttp_pi/xhttp_pi_fnc.c --- Diff: https://github.com/kamailio/kamailio/commit/3a81cd7b2dc0b9a5c540a54c3441336… Patch: https://github.com/kamailio/kamailio/commit/3a81cd7b2dc0b9a5c540a54c3441336… --- diff --git a/src/modules/xhttp_pi/xhttp_pi_fnc.c b/src/modules/xhttp_pi/xhttp_pi_fnc.c index fdc3b09..e87beef 100644 --- a/src/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/src/modules/xhttp_pi/xhttp_pi_fnc.c @@ -1919,7 +1919,10 @@ int ph_init_cmds(ph_framework_t **framework_data, const char* filename) if(ph_getMods(_framework_data, framework_node)!=0) goto xml_error; - if(doc)xmlFree(doc);doc=NULL; + if(doc) { + xmlFree(doc); + doc=NULL; + } *framework_data = _framework_data; }else{ /* This is a reload */ _ph_db_tables = _framework_data->ph_db_tables; @@ -1939,7 +1942,10 @@ int ph_init_cmds(ph_framework_t **framework_data, const char* filename) if(ph_getMods(_framework_data, framework_node)!=0) goto xml_reload_error; - if(doc)xmlFree(doc);doc=NULL; + if(doc){ + xmlFree(doc); + doc=NULL; + } *framework_data = _framework_data; } @@ -1947,7 +1953,10 @@ int ph_init_cmds(ph_framework_t **framework_data, const char* filename) xml_error: /* FIXME: free thw whole structure */ if(_framework_data){shm_free(_framework_data);} - if(doc)xmlFree(doc);doc=NULL; + if(doc){ + xmlFree(doc); + doc=NULL; + } return -1; xml_reload_error: ph_freeDbTables(&_framework_data->ph_db_tables, @@ -1958,7 +1967,10 @@ int ph_init_cmds(ph_framework_t **framework_data, const char* filename) _framework_data->ph_db_tables_size = _ph_db_tables_size; _framework_data->ph_modules = _ph_modules; _framework_data->ph_modules_size = _ph_modules_size; - if(doc)xmlFree(doc);doc=NULL; + if(doc) { + xmlFree(doc); + doc=NULL; + } return -1; }

1 0

git:master:597625d0: app_jsdt: fix compiler warning
by Victor Seva 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: 597625d08bd639ddb46609e6af22af0dad28b870 URL: https://github.com/kamailio/kamailio/commit/597625d08bd639ddb46609e6af22af0… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-01-12T16:12:38+01:00 app_jsdt: fix compiler warning > In file included from app_jsdt_api.c:28:0: > app_jsdt_api.c: In function 'app_jsdt_rpc_reload': > ../../core/dprint.h:316:8: warning: 'v' may be used uninitialized in this function [-Wmaybe-uninitialized] > _km_log_func(LOG2SYSLOG_LEVEL(__llevel) |\ > ^~~~~~~~~~~~ > app_jsdt_api.c:1298:6: note: 'v' was declared here > int v; > ^ --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/597625d08bd639ddb46609e6af22af0… Patch: https://github.com/kamailio/kamailio/commit/597625d08bd639ddb46609e6af22af0… --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index a903375..ad5ec34 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -1309,11 +1309,10 @@ static void app_jsdt_rpc_reload(rpc_t* rpc, void* ctx) return; } + v = *_sr_jsdt_reload_version; LM_INFO("marking for reload js script file: %.*s (%d => %d)\n", _sr_jsdt_load_file.len, _sr_jsdt_load_file.s, _sr_jsdt_local_version, v); - - v = *_sr_jsdt_reload_version; *_sr_jsdt_reload_version += 1; if (rpc->add(ctx, "{", &vh) < 0) {

1 0

Have save() function return an error code when 503 is generated
by Lucian Balaceanu 12 Jan '17

12 Jan '17

Hi Daniel, We would like to know when the save("location") has generated a 503 message and as such we are thinking of modifying the save() function to return a code (like -2) for this error. The default behaviour now seems to be that most errors in save() log a notice message, generate a reply via reg_send_reply() and then make sure that config doesn't go on with processing by returning 0. (tag "error:" in save() function definition) Are you ok with such an intrusion in the code? If so, I will prepare a patch. Also, do you see an alternative to determining that this 503 message has been generated? Thank you, Lucian Balaceanu

1 0

git:master:70da31a9: modules: readme files regenerated - ims_registrar_scscf ...
by Kamailio Dev 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: 70da31a9fdaf2808f152199afd5a2468f0f008d2 URL: https://github.com/kamailio/kamailio/commit/70da31a9fdaf2808f152199afd5a246… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-01-12T14:46:18+01:00 modules: readme files regenerated - ims_registrar_scscf ... --- Modified: src/modules/ims_registrar_scscf/README --- Diff: https://github.com/kamailio/kamailio/commit/70da31a9fdaf2808f152199afd5a246… Patch: https://github.com/kamailio/kamailio/commit/70da31a9fdaf2808f152199afd5a246…

1 0

git:master:e330a710: IMS-Registrar-S-CSCF: Make the error-reply-code configurable
by Carsten Bock 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: e330a71081c0b8e431c1885dfc79a0ae45cc782d URL: https://github.com/kamailio/kamailio/commit/e330a71081c0b8e431c1885dfc79a0a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-01-12T14:44:03+01:00 IMS-Registrar-S-CSCF: Make the error-reply-code configurable --- Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml Modified: src/modules/ims_registrar_scscf/reg_mod.c Modified: src/modules/ims_registrar_scscf/reg_mod.h Modified: src/modules/ims_registrar_scscf/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/e330a71081c0b8e431c1885dfc79a0a… Patch: https://github.com/kamailio/kamailio/commit/e330a71081c0b8e431c1885dfc79a0a… --- diff --git a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml index 672088f..ef1bfdf 100644 --- a/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml +++ b/src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_admin.xml @@ -407,6 +407,30 @@ </programlisting> </example> </section> + + <section> + <title>error_reply_code (int)</title> + + <para>In certain error conditions, the S-CSCF may not be able to process + the request (e.g. in case of database failures). Per default and + according to the Specs, the S-CSCF would return a 500 error in this + case. However, according to the SIP-Specs for DNS-SRV, this won't + trigger a failover, which may be desired.</para> + + <para>This parameter let's you override the default 500 with another + return-code (e.g. 503) in order to get the desired behaviour.</para> + + <para><emphasis> Default value is 500. </emphasis></para> + + <example> + <title>Set <varname>error_reply_code</varname> parameter</title> + + <programlisting format="linespecific">... + modparam("ims_registrar_scscf", "error_reply_code", 503) +...</programlisting> + </example> + </section> + </section> <section> diff --git a/src/modules/ims_registrar_scscf/reg_mod.c b/src/modules/ims_registrar_scscf/reg_mod.c index a84b396..66ec247 100644 --- a/src/modules/ims_registrar_scscf/reg_mod.c +++ b/src/modules/ims_registrar_scscf/reg_mod.c @@ -101,6 +101,8 @@ int ue_unsubscribe_on_dereg = 0; /*many UEs do not unsubscribe on de reg - ther int user_data_always = 0; /* Always Reports that user data is missing to HSS */ +int error_reply_code = 500; /**< Error-Reply-Code */ + /* parameters storage */ str cxdx_dest_realm = str_init("ims.smilecoms.com"); @@ -270,6 +272,7 @@ static param_export_t params[] = { {"ue_unsubscribe_on_dereg", INT_PARAM, &ue_unsubscribe_on_dereg}, {"subscription_expires_range", INT_PARAM, &subscription_expires_range}, {"user_data_always", INT_PARAM, &user_data_always}, + {"error_reply_code", INT_PARAM, &error_reply_code}, {"notification_list_size_threshold", INT_PARAM, &notification_list_size_threshold}, {"max_notification_list_size", INT_PARAM, &max_notification_list_size}, {"notification_processes", INT_PARAM, &notification_processes}, diff --git a/src/modules/ims_registrar_scscf/reg_mod.h b/src/modules/ims_registrar_scscf/reg_mod.h index 5bd2fa6..2d3e399 100644 --- a/src/modules/ims_registrar_scscf/reg_mod.h +++ b/src/modules/ims_registrar_scscf/reg_mod.h @@ -85,6 +85,7 @@ extern int nat_flag; +extern int error_reply_code; extern int tcp_persistent_flag; extern int received_avp; diff --git a/src/modules/ims_registrar_scscf/reply.c b/src/modules/ims_registrar_scscf/reply.c index 1185510..559135a 100644 --- a/src/modules/ims_registrar_scscf/reply.c +++ b/src/modules/ims_registrar_scscf/reply.c @@ -674,6 +674,7 @@ int reg_send_reply_transactional(struct sip_msg* _m, contact_for_header_t* conta } code = codes[rerrno]; + if ((code == 500) && (error_reply_code > 0)) code = error_reply_code; switch (code) { case 200: msg.s = MSG_200; msg.len = sizeof (MSG_200) - 1; @@ -767,6 +768,8 @@ int reg_send_reply(struct sip_msg* _m, contact_for_header_t* contact_header) { } code = codes[rerrno]; + if ((code == 500) && (error_reply_code > 0)) code = error_reply_code; + switch (code) { case 200: msg.s = MSG_200; msg.len = sizeof (MSG_200) - 1;

1 0

git:master:cd6313a4: IMS-USRLOC-PCSCF: Set contact to NULL for safety, if not found
by Carsten Bock 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: cd6313a4f2b816df38c174e6b68c1a1bd3fc1f23 URL: https://github.com/kamailio/kamailio/commit/cd6313a4f2b816df38c174e6b68c1a1… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-01-12T14:44:03+01:00 IMS-USRLOC-PCSCF: Set contact to NULL for safety, if not found --- Modified: src/modules/ims_usrloc_pcscf/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/cd6313a4f2b816df38c174e6b68c1a1… Patch: https://github.com/kamailio/kamailio/commit/cd6313a4f2b816df38c174e6b68c1a1… --- diff --git a/src/modules/ims_usrloc_pcscf/udomain.c b/src/modules/ims_usrloc_pcscf/udomain.c index 2fdd648..8720c32 100644 --- a/src/modules/ims_usrloc_pcscf/udomain.c +++ b/src/modules/ims_usrloc_pcscf/udomain.c @@ -567,6 +567,8 @@ int get_pcontact(udomain_t* _d, pcontact_info_t* contact_info, struct pcontact** } LM_DBG("contact not found in memory\n"); + // Default: Not found. + *_c = NULL; return 1; /* Nothing found */ }

1 0

git:master:ce14ab12: IMS-USRLOC-SCSCF: Some more safety checks
by Carsten Bock 12 Jan '17

12 Jan '17

Module: kamailio Branch: master Commit: ce14ab12a1b616f07a4fd715ad0097881035fded URL: https://github.com/kamailio/kamailio/commit/ce14ab12a1b616f07a4fd715ad00978… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-01-12T14:44:03+01:00 IMS-USRLOC-SCSCF: Some more safety checks --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/ce14ab12a1b616f07a4fd715ad00978… Patch: https://github.com/kamailio/kamailio/commit/ce14ab12a1b616f07a4fd715ad00978… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index 57eb22f..2a25d90 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -290,20 +290,22 @@ int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { tmp = _c->params; while (tmp) { - if (tmp->next == 0) { - format_name_and_body = param_name_and_body_last.s; - format_name_no_body = param_name_no_body_last.s; - } else { - format_name_and_body = param_name_and_body.s; - format_name_no_body = param_name_no_body.s; - } - if (tmp->body.len > 0) { - sprintf(param_pad.s, format_name_and_body, tmp->name.len, tmp->name.s, tmp->body.len, tmp->body.s); - } else { - sprintf(param_pad.s, format_name_no_body, tmp->name.len, tmp->name.s); + if (tmp->name.len > 0) { + if (tmp->next == 0) { + format_name_and_body = param_name_and_body_last.s; + format_name_no_body = param_name_no_body_last.s; + } else { + format_name_and_body = param_name_and_body.s; + format_name_no_body = param_name_no_body.s; + } + if (tmp->body.len > 0) { + sprintf(param_pad.s, format_name_and_body, tmp->name.len, tmp->name.s, tmp->body.len, tmp->body.s); + } else { + sprintf(param_pad.s, format_name_no_body, tmp->name.len, tmp->name.s); + } + param_pad.len = strlen(param_pad.s); + STR_APPEND(param_buf, param_pad); } - param_pad.len = strlen(param_pad.s); - STR_APPEND(param_buf, param_pad); tmp = tmp->next; } LM_DBG("Converted params to string to insert into db: [%.*s]\n", param_buf.len, param_buf.s); @@ -322,8 +324,12 @@ int db_insert_ucontact(impurecord_t* _r, ucontact_t* _c) { val[0].val.str_val = _c->c; val[1].type = DB1_STR; - val[1].nul = 0; - val[1].val.str_val = param_buf; + if (param_buf.len > 0) { + val[1].nul = 0; + val[1].val.str_val = param_buf; + } else { + val[1].nul = 1; + } val[2].type = DB1_STR; val[2].nul = 0; @@ -1073,8 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); - query_buffer.len = strlen(query_buffer.s);//len; + query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

← Newer
1
...
24
25
26
27
28
29
30
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017