sr-dev September 2015

sr-dev@lists.kamailio.org

37 participants
387 discussions

git:master:cb3c461a: Return CSCF_RETURN_FALSE if AAR is not generated
by Federico Favaro 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: cb3c461a48c65d61fc563c0dc2b87fd57647dae8 URL: https://github.com/kamailio/kamailio/commit/cb3c461a48c65d61fc563c0dc2b87fd… Author: Federico Favaro <federico(a)aereo.lan.athonet.com> Committer: Federico Favaro <federico(a)aereo.lan.athonet.com> Date: 2015-09-03T12:01:07+02:00 Return CSCF_RETURN_FALSE if AAR is not generated Differentiate the cases where AAR is not sent because of an error and the cases where AAR is not sent because it is … [View More]logically wrong to sent them at that point of the Transaction --- Modified: modules/ims_qos/mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cb3c461a48c65d61fc563c0dc2b87fd… Patch: https://github.com/kamailio/kamailio/commit/cb3c461a48c65d61fc563c0dc2b87fd… --- diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index 833532e..d826645 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -622,6 +622,7 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int //We don't ever do AAR on request for calling scenario... if (msg->first_line.type != SIP_REPLY) { LM_DBG("Can't do AAR for call session in request\n"); + result = CSCF_RETURN_FALSE; return result; } @@ -634,17 +635,19 @@ static int w_rx_aar(struct sip_msg *msg, char *route, char* dir, char *c_id, int } //we dont apply QoS if its not a reply to an INVITE! or UPDATE or PRACK! - if ((t->method.len == 5 && memcmp(t->method.s, "PRACK", 5) == 0) - || (t->method.len == 6 && (memcmp(t->method.s, "INVITE", 6) == 0 - || memcmp(t->method.s, "UPDATE", 6) == 0))) { - if (cscf_get_content_length(msg) == 0 - || cscf_get_content_length(t->uas.request) == 0) { - LM_DBG("No SDP offer answer -> therefore we can not do Rx AAR"); - //goto aarna; //AAR na if we dont have offer/answer pair - return result; - } + if ((t->method.len == 5 && memcmp(t->method.s, "PRACK", 5) == 0) + || (t->method.len == 6 && (memcmp(t->method.s, "INVITE", 6) == 0 + || memcmp(t->method.s, "UPDATE", 6) == 0))) { + if (cscf_get_content_length(msg) == 0 + || cscf_get_content_length(t->uas.request) == 0) { + LM_DBG("No SDP offer answer -> therefore we can not do Rx AAR"); + //goto aarna; //AAR na if we dont have offer/answer pair + result = CSCF_RETURN_FALSE; + return result; + } } else { LM_DBG("Message is not response to INVITE, PRACK or UPDATE -> therefore we do not Rx AAR"); + result = CSCF_RETURN_FALSE; return result; } [View Less]

1 0

[kamailio] t_reply sends cancel to a terminated branch (#315)
by ThomasSevestre 07 Sep '15

07 Sep '15

Hi, I'm using t_reply if onreply_route as follow: route { ... t_on_reply("ERROR"); ... t_relay(); } onreply_route[ERROR] { t_reply("500", "Error"); } I have this call flow: CLIENT KAMAILIO CARRIER |--- INVITE ---> | |---- INVITE --->| |<---- 100 ------| |<--- 100 --------| |<---- 503 ------| |---- ACK ------… [View More]

2 6

git:master:4b2d6dd7: tm: enable drop in onsend_route for tm replies
by Daniel-Constantin Mierla 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: 4b2d6dd7ce1a61c964f7d996c2db4428010dd478 URL: https://github.com/kamailio/kamailio/commit/4b2d6dd7ce1a61c964f7d996c2db442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T16:35:10+02:00 tm: enable drop in onsend_route for tm replies - skip sending out the reply by resetting the send_socket --- Modified: modules/tm/t_reply.c --- Diff: https://github.com/… [View More]

1 0

git:master:2690a8c3: tm: execute the onsend_route for responses forwarded by tm module
by Daniel-Constantin Mierla 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: 2690a8c314d23406649dceaadce7032690500a6e URL: https://github.com/kamailio/kamailio/commit/2690a8c314d23406649dceaadce7032… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T16:31:11+02:00 tm: execute the onsend_route for responses forwarded by tm module - not executed for local generated sip responses --- Modified: modules/tm/t_reply.c --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/2690a8c314d23406649dceaadce7032… Patch: https://github.com/kamailio/kamailio/commit/2690a8c314d23406649dceaadce7032… --- diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 8da3205..213e8a6 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1729,6 +1729,7 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, str* to_tag; str reason; struct tmcb_params onsend_params; + struct ip_addr ip; /* keep compiler warnings about use of uninit vars silent */ res_len=0; @@ -1737,7 +1738,6 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, relayed_code=0; totag_retr=0; - /* remember, what was sent upstream to know whether we are * forwarding a first final reply or not */ @@ -1921,23 +1921,34 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, if (reply_status == RPS_COMPLETED) { start_final_repl_retr(t); } - if (likely(uas_rb->dst.send_sock && - SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0)){ - if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ - LOCK_REPLIES( t ); - run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, - relayed_msg, relayed_code); - UNLOCK_REPLIES( t ); + if (likely(uas_rb->dst.send_sock)) { + + if (onsend_route_enabled(SIP_REPLY) && p_msg && (p_msg != FAKED_REPLY)) { + if (run_onsend(p_msg, &uas_rb->dst, buf, res_len)==0){ + su2ip_addr(&ip, &(uas_rb->dst.to)); + LOG(L_ERR, "forward_reply: reply to %s:%d(%d) dropped" + " (onsend_route)\n", ip_addr2a(&ip), + su_getport(&(uas_rb->dst.to)), uas_rb->dst.proto); + } } - if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT))){ - INIT_TMCB_ONSEND_PARAMS(onsend_params, t->uas.request, - relayed_msg, uas_rb, &uas_rb->dst, buf, - res_len, - (relayed_msg==FAKED_REPLY)?TMCB_LOCAL_F:0, - uas_rb->branch, relayed_code); - LOCK_REPLIES( t ); - run_trans_callbacks_off_params(TMCB_RESPONSE_SENT, t, &onsend_params); - UNLOCK_REPLIES( t ); + + if (SEND_PR_BUFFER( uas_rb, buf, res_len ) >= 0){ + if (unlikely(!totag_retr && has_tran_tmcbs(t, TMCB_RESPONSE_OUT))){ + LOCK_REPLIES( t ); + run_trans_callbacks_with_buf( TMCB_RESPONSE_OUT, uas_rb, t->uas.request, + relayed_msg, relayed_code); + UNLOCK_REPLIES( t ); + } + if (unlikely(has_tran_tmcbs(t, TMCB_RESPONSE_SENT))){ + INIT_TMCB_ONSEND_PARAMS(onsend_params, t->uas.request, + relayed_msg, uas_rb, &uas_rb->dst, buf, + res_len, + (relayed_msg==FAKED_REPLY)?TMCB_LOCAL_F:0, + uas_rb->branch, relayed_code); + LOCK_REPLIES( t ); + run_trans_callbacks_off_params(TMCB_RESPONSE_SENT, t, &onsend_params); + UNLOCK_REPLIES( t ); + } } } else if (unlikely(uas_rb->dst.send_sock == 0)) ERR("no resolved dst to send reply to\n"); [View Less]

1 0

git:master:061baf51: Merge pull request #316 from kamailio/vseva/pv_xavp_to_var
by Victor Seva 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: 061baf5175f757d581385ad4ed05983ba69b5b92 URL: https://github.com/kamailio/kamailio/commit/061baf5175f757d581385ad4ed05983… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-07T16:20:55+02:00 Merge pull request #316 from kamailio/vseva/pv_xavp_to_var pv: pv_xavp_to_var() --- Modified: modules/pv/README Modified: modules/pv/doc/pv_admin.xml Modified: … [View More]

1 0

git:master:e6505819: pv: regenerate README
by Victor Seva 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: e6505819e51ffe601b4a144db3f7922234c92f2f URL: https://github.com/kamailio/kamailio/commit/e6505819e51ffe601b4a144db3f7922… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-07T15:52:42+02:00 pv: regenerate README --- Modified: modules/pv/README --- Diff: https://github.com/kamailio/kamailio/commit/e6505819e51ffe601b4a144db3f7922… Patch: https://github.… [View More]com/kamailio/kamailio/commit/e6505819e51ffe601b4a144db3f7922… --- diff --git a/modules/pv/README b/modules/pv/README index 89774e1..7c78e96 100644 --- a/modules/pv/README +++ b/modules/pv/README @@ -47,6 +47,7 @@ Daniel-Constantin Mierla 4.9. sbranch_reset() 4.10. pv_xavp_print() 4.11. pv_var_to_xavp(varname, xname) + 4.12. pv_xavp_to_var(xname) 5. MI Commands @@ -74,8 +75,9 @@ Daniel-Constantin Mierla 1.12. sbranch_append() usage 1.13. pv_xavp_print() usage 1.14. pv_var_to_xavp() usage - 1.15. shv_set usage - 1.16. shv_get usage + 1.15. pv_xavp_to_var() usage + 1.16. shv_set usage + 1.17. shv_get usage Chapter 1. Admin Guide @@ -106,6 +108,7 @@ Chapter 1. Admin Guide 4.9. sbranch_reset() 4.10. pv_xavp_print() 4.11. pv_var_to_xavp(varname, xname) + 4.12. pv_xavp_to_var(xname) 5. MI Commands @@ -211,6 +214,7 @@ modparam("pv","avp_aliases","email=s:email_addr;tmp=i:100") 4.9. sbranch_reset() 4.10. pv_xavp_print() 4.11. pv_var_to_xavp(varname, xname) + 4.12. pv_xavp_to_var(xname) 4.1. pv_isset(pvar) @@ -395,6 +399,22 @@ $xavp("ok[0]=>temp") now is 3 $xavp("ok[0]=>foo") now is "foo indeed" ... +4.12. pv_xavp_to_var(xname) + + Copy xavp values to vars. Reverse of pv_var_to_xavp(). + + Function can be used from ANY_ROUTE. + + Example 1.15. pv_xavp_to_var() usage +... +$xavp("bar=>temp") = 3; +$xavp("bar[0]=>foo") = "foo indeed"; +pv_xavp_to_var("bar"); +... +$var("temp") now is 3 +$var("foo") now is "foo indeed" +... + 5. MI Commands 5.1. shv_set @@ -418,7 +438,7 @@ $xavp("ok[0]=>foo") now is "foo indeed" _value_ _empty_line_ - Example 1.15. shv_set usage + Example 1.16. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... @@ -436,7 +456,7 @@ $ kamctl fifo shv_set debug int 0 _name_ _empty_line_ - Example 1.16. shv_get usage + Example 1.17. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get [View Less]

1 0

git:master:dad1f24b: pv: pv_xavp_to_var()
by Victor Seva 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: dad1f24bee3f33c9902e487853be6f13b274aa93 URL: https://github.com/kamailio/kamailio/commit/dad1f24bee3f33c9902e487853be6f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-09-07T15:52:42+02:00 pv: pv_xavp_to_var() --- Modified: modules/pv/doc/pv_admin.xml Modified: modules/pv/pv.c Modified: modules/pv/pv_xavp.c Modified: modules/pv/pv_xavp.h --- Diff: … [View More]https://github.com/kamailio/kamailio/commit/dad1f24bee3f33c9902e487853be6f1… Patch: https://github.com/kamailio/kamailio/commit/dad1f24bee3f33c9902e487853be6f1… --- diff --git a/modules/pv/doc/pv_admin.xml b/modules/pv/doc/pv_admin.xml index bed862d..4cbd6b80 100644 --- a/modules/pv/doc/pv_admin.xml +++ b/modules/pv/doc/pv_admin.xml @@ -426,6 +426,30 @@ $xavp("ok[0]=>foo") now is "foo indeed" </programlisting> </example> </section> + <section id="pv.f.pv_xavp_to_var"> + <title> + <function moreinfo="none">pv_xavp_to_var(xname)</function> + </title> + <para> + Copy xavp values to vars. Reverse of pv_var_to_xavp(). + </para> + <para> + Function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_xavp_to_var()</function> usage</title> + <programlisting format="linespecific"> +... +$xavp("bar=>temp") = 3; +$xavp("bar[0]=>foo") = "foo indeed"; +pv_xavp_to_var("bar"); +... +$var("temp") now is 3 +$var("foo") now is "foo indeed" +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/pv/pv.c b/modules/pv/pv.c index 5e141c1..4ed9171 100644 --- a/modules/pv/pv.c +++ b/modules/pv/pv.c @@ -495,6 +495,7 @@ static int w_sbranch_set_ruri(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_append(sip_msg_t *msg, char p1, char *p2); static int w_sbranch_reset(sip_msg_t *msg, char p1, char *p2); static int w_var_to_xavp(sip_msg_t *msg, char *p1, char *p2); +static int w_xavp_to_var(sip_msg_t *msg, char *p1); static int pv_init_rpc(void); @@ -508,6 +509,8 @@ static cmd_export_t cmds[]={ ANY_ROUTE }, {"pv_var_to_xavp", (cmd_function)w_var_to_xavp, 2, 0, 0, ANY_ROUTE }, + {"pv_xavp_to_var", (cmd_function)w_xavp_to_var, 1, 0, 0, + ANY_ROUTE }, #endif {"is_int", (cmd_function)is_int, 1, fixup_pvar_null, fixup_free_pvar_null, ANY_ROUTE}, @@ -710,6 +713,19 @@ static int w_var_to_xavp(sip_msg_t *msg, char *s1, char *s2) return pv_var_to_xavp(&varname, &xname); } +static int w_xavp_to_var(sip_msg_t *msg, char *s1) +{ + str xname; + + if(s1 == NULL) { + LM_ERR("wrong parameters\n"); + return -1; + } + + xname.s = s1; xname.len = strlen(s1); + return pv_xavp_to_var(&xname); +} + /** * */ diff --git a/modules/pv/pv_xavp.c b/modules/pv/pv_xavp.c index 0db1977..8c11426 100644 --- a/modules/pv/pv_xavp.c +++ b/modules/pv/pv_xavp.c @@ -674,4 +674,62 @@ int pv_var_to_xavp(str *varname, str *xname) xavp_rm_by_name(xname, 1, NULL); return -1; } + +int pv_xavp_to_var_helper(sr_xavp_t *avp) { + script_var_t *it; + int_str value; + int flags = 0; + + it = add_var(&avp->name, VAR_TYPE_ZERO); + if(!it) return -1; + if(avp->val.type==SR_XTYPE_STR){ + flags |= VAR_VAL_STR; + value.s.len = avp->val.v.s.len; + value.s.s = avp->val.v.s.s; + LM_DBG("var:[%.*s] STR:[%.*s]\n", avp->name.len, avp->name.s, + value.s.len, value.s.s); + } + else if(avp->val.type==SR_XTYPE_INT) { + flags |= VAR_VAL_INT; + value.n = avp->val.v.i; + LM_DBG("var:[%.*s] INT:[%d]\n", avp->name.len, avp->name.s, + value.n); + } else { + LM_ERR("avp type not STR nor INT\n"); + return -1; + } + set_var_value(it, &value, flags); + + return 0; +} + +int pv_xavp_to_var(str *xname) { + sr_xavp_t *xavp; + sr_xavp_t *avp; + + LM_DBG("xname:%.*s\n", xname->len, xname->s); + + xavp = xavp_get_by_index(xname, 0, NULL); + if(!xavp) { + LM_ERR("xavp [%.*s] not found\n", xname->len, xname->s); + return -1; + } + if(xavp->val.type!=SR_XTYPE_XAVP){ + LM_ERR("%.*s not xavp type?\n", xname->len, xname->s); + return -1; + } + avp = xavp->val.v.xavp; + if (avp) + { + if(pv_xavp_to_var_helper(avp)<0) return -1; + avp = avp->next; + } + + while(avp) + { + if(pv_xavp_to_var_helper(avp)<0) return -1; + avp = avp->next; + } + return 1; +} #endif diff --git a/modules/pv/pv_xavp.h b/modules/pv/pv_xavp.h index 97d2bec..f9ed6fc 100644 --- a/modules/pv/pv_xavp.h +++ b/modules/pv/pv_xavp.h @@ -33,6 +33,7 @@ int pv_xavp_print(struct sip_msg* msg, char* s1, char *s2); int xavp_params_explode(str *params, str *xname); int pv_var_to_xavp(str *varname, str *xname); +int pv_xavp_to_var(str *xname); #endif #endif [View Less]

1 0

[kamailio] pv: pv_xavp_to_var() (#316)
by Victor Seva 07 Sep '15

07 Sep '15

Revert function of pv_var_to_xavp() You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/316 -- Commit Summary -- * pv: pv_xavp_to_var() * pv: regenerate README -- File Changes -- M modules/pv/README (28) M modules/pv/doc/pv_admin.xml (24) M modules/pv/pv.c (16) M modules/pv/pv_xavp.c (58) M modules/pv/pv_xavp.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/316.patch https://github.com/… [View More]

2 2

git:master:919357cc: corex: readme updated with file_read() and file_write()
by Daniel-Constantin Mierla 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: 919357cc87b4403de2f6cdeeaa75e9f3f98e1307 URL: https://github.com/kamailio/kamailio/commit/919357cc87b4403de2f6cdeeaa75e9f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T14:58:58+02:00 corex: readme updated with file_read() and file_write() --- Modified: modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]919357cc87b4403de2f6cdeeaa75e9f… Patch: https://github.com/kamailio/kamailio/commit/919357cc87b4403de2f6cdeeaa75e9f… --- diff --git a/modules/corex/README b/modules/corex/README index 483fd38..6ed1d43 100644 --- a/modules/corex/README +++ b/modules/corex/README @@ -46,6 +46,8 @@ Muhammad Shahzad Shafi 4.6. msg_iflag_set(flagname) 4.7. msg_iflag_reset(flagname) 4.8. msg_iflag_is_set(flagname) + 4.9. file_read(fpath, var) + 4.10. file_write(fpath, content) 5. RPC Commands @@ -73,8 +75,10 @@ Muhammad Shahzad Shafi 1.9. msg_iflag_set usage 1.10. msg_iflag_reset usage 1.11. msg_iflag_is_set usage - 1.12. event_route[network:msg] use cases - 1.13. Sample PERL code for do_compress and do_uncompress + 1.12. file_read usage + 1.13. file_write usage + 1.14. event_route[network:msg] use cases + 1.15. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -103,6 +107,8 @@ Chapter 1. Admin Guide 4.6. msg_iflag_set(flagname) 4.7. msg_iflag_reset(flagname) 4.8. msg_iflag_is_set(flagname) + 4.9. file_read(fpath, var) + 4.10. file_write(fpath, content) 5. RPC Commands @@ -228,6 +234,8 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.6. msg_iflag_set(flagname) 4.7. msg_iflag_reset(flagname) 4.8. msg_iflag_is_set(flagname) + 4.9. file_read(fpath, var) + 4.10. file_write(fpath, content) 4.1. append_branch([ uri, [ q ] ]) @@ -352,6 +360,28 @@ event_route[network:msg] { if(msg_iflag_is_set("UAC_AUTH")) { ... } ... +4.9. file_read(fpath, var) + + Read content of a text file into a variable. + + This function can be used from ANY_ROUTE. + + Example 1.12. file_read usage +... +if(file_read("/tmp/data.txt", "$var(data)")) { ... } +... + +4.10. file_write(fpath, content) + + Write content of parameter to a text file. + + This function can be used from ANY_ROUTE. + + Example 1.13. file_write usage +... +if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } +... + 5. RPC Commands 5.1. corex.list_sockets @@ -461,7 +491,7 @@ event_route[network:msg] { Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.12. event_route[network:msg] use cases + Example 1.14. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -492,7 +522,7 @@ event_route[network:msg] { } ... - Example 1.13. Sample PERL code for do_compress and do_uncompress + Example 1.15. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings; [View Less]

1 0

git:master:9ea2d8de: corex: documented file_read() and file_write()
by Daniel-Constantin Mierla 07 Sep '15

07 Sep '15

Module: kamailio Branch: master Commit: 9ea2d8de54f461844dee580f6288bafb3144032e URL: https://github.com/kamailio/kamailio/commit/9ea2d8de54f461844dee580f6288baf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-09-07T14:58:58+02:00 corex: documented file_read() and file_write() --- Modified: modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2015