sr-dev May 2011

sr-dev@lists.kamailio.org

28 participants
166 discussions

git:master: rtpproxy: safety check for T_UNDEFINED
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: ae051ee22a054120b7469cd17d71325a5f5c3cac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae051ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 23:25:56 2011 +0200 rtpproxy: safety check for T_UNDEFINED - be sure the T is valid before setting SDP flag in uas.request --- modules/rtpproxy/rtpproxy.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 3807954..f6f018f 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -1729,7 +1729,8 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) (ip!=NULL)?1:0); if(method==METHOD_INVITE && nosdp==0) { msg->msg_flags |= FL_SDP_BODY; - if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL) + if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL + && tmb.t_gett()!=T_UNDEFINED) tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; if(route_type==FAILURE_ROUTE) return unforce_rtp_proxy_f(msg, 0, 0);

1 0

git:master: rtpproxy: aliased rtpproxy_destroy() to unforce_rtp_proxy()
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: 41df497150c8eb87dca66fe2d2be3a2c490f9aec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=41df497… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 17:40:58 2011 +0200 rtpproxy: aliased rtpproxy_destroy() to unforce_rtp_proxy() --- modules/rtpproxy/README | 124 ++++++++++++++++--------------- modules/rtpproxy/doc/rtpproxy_admin.xml | 16 +++- modules/rtpproxy/rtpproxy.c | 3 + 3 files changed, 80 insertions(+), 63 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=41d…

1 0

Stale nonce for Authentication
by Juha Heinanen 28 May '11

28 May '11

martin, what was the conclusion regarding your stale nonce param patch? i would do it so that if www or proxy_authorize function returns -4 (stale nonce) then i would call www or proxy_challenge with stale flag on. it would then cause stale=true to be added to the header. i don't understand why your patch calls pre_auth, since the request was already authenticated and it failed due to stale nonce. -- juha

2 6

git:master: modules/auth: new flag 16 to add stale= true to challenge response
by Juha Heinanen 28 May '11

28 May '11

Module: sip-router Branch: master Commit: b63f14b1fd5042b3b605794d6bb18a4030e573ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b63f14b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 28 11:43:41 2011 +0300 modules/auth: new flag 16 to add stale=true to challenge response --- modules/auth/README | 2 ++ modules/auth/auth_mod.c | 10 ++++++++-- modules/auth/doc/functions.xml | 9 +++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/modules/auth/README b/modules/auth/README index 0c34aa8..04d7594 100644 --- a/modules/auth/README +++ b/modules/auth/README @@ -539,6 +539,7 @@ if (www_authenticate("realm", "subscriber)) { + 4 - do not send '500 Internal Server Error' reply automatically in failure cases (error code is returned to config) + + 16 - build challenge header with stale=true This function can be used from REQUEST_ROUTE. @@ -607,6 +608,7 @@ if (!proxy_authenticate("$fd", "subscriber)) { + 2 - build challenge header with no qop and add it to avp + 4 - build challenge header with qop=auth and add it to avp + 8 - build challenge header with qop=auth-int and add it to avp + + 16 - build challenge header with stale=true When challenge header is built and stored in avp, append_to_reply() and sl reply functions can be used to send appropriate SIP reply to diff --git a/modules/auth/auth_mod.c b/modules/auth/auth_mod.c index c44fb96..a28c2ba 100644 --- a/modules/auth/auth_mod.c +++ b/modules/auth/auth_mod.c @@ -635,7 +635,7 @@ static int auth_send_reply(struct sip_msg *msg, int code, char *reason, */ int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) { - int ret; + int ret, stale; str hf = {0, 0}; struct qp *qop = NULL; @@ -646,7 +646,13 @@ int auth_challenge(struct sip_msg *msg, str *realm, int flags, int hftype) } else if(flags&1) { qop = &auth_qauth; } - if (get_challenge_hf(msg, 0, realm, NULL, NULL, qop, hftype, &hf) < 0) { + if (flags & 16) { + stale = 1; + } else { + stale = 0; + } + if (get_challenge_hf(msg, stale, realm, NULL, NULL, qop, hftype, &hf) + < 0) { ERR("Error while creating challenge\n"); ret = -2; goto error; diff --git a/modules/auth/doc/functions.xml b/modules/auth/doc/functions.xml index f452529..d328def 100644 --- a/modules/auth/doc/functions.xml +++ b/modules/auth/doc/functions.xml @@ -81,6 +81,10 @@ if (www_authenticate("realm", "subscriber)) { Server Error' reply automatically in failure cases (error code is returned to config)</para> </listitem> + <listitem> + <para><emphasis>16</emphasis> - build challenge header with + stale=true</para> + </listitem> </itemizedlist> </listitem> </itemizedlist> @@ -214,6 +218,11 @@ if (!proxy_authenticate("$fd", "subscriber)) { <para><emphasis>8</emphasis> - build challenge header with qop=auth-int and add it to avp</para> </listitem> + <listitem> + <para><emphasis>16</emphasis> - build challenge header with + stale=true</para> + </listitem> + </itemizedlist> </listitem> </itemizedlist>

1 0

git:master: Makefile: version set to 3.2.0-dev5
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: 1d49c039699a4095219fa7f7f9c6facf22e64d92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d49c03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 10:11:09 2011 +0200 Makefile: version set to 3.2.0-dev5 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 0bdb654..65ae568 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev4 +EXTRAVERSION = -dev5 # memory debugger switcher # 0 - off (release mode)

1 0

git:master: rpproxy: new function rtpproxy_manage()
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: 7b7791c3e578e57ab33e9381d876ac3cf9103b8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b7791c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 08:57:19 2011 +0200 rpproxy: new function rtpproxy_manage() - auto-pilot function to handle rtp proxy session management - it can take same kind of parameters as rtpproxy_offer() - embeds the functionality of rtpproxy_offer(), rtpproxy_answer() and unfroce_rtp_proxy(): - if INVITE with SDP, then do rtpproxy offer - if INVITE with sdp, when tm is loaded, mark transaction with internal flag FL_SDP_BODY to know that the 1xx and 2xx are for rtp answer - if ACK with SDP, then do rtpproxy answer - if BYE or CANCEL, then do unforce rtpproxy - if reply to INVITE with code >= 300 do unfrce rtp proxy - if reply with SDP to INVITE having code 1xx and 2xx, then do rtpproxy answer if the request had SDP or tm is not loaded, otherwise do rtpproxy offer --- modules/rtpproxy/rtpproxy.c | 101 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 101 insertions(+), 0 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 23a8a2d..15cfcc1 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -219,6 +219,7 @@ #include "../../socket_info.h" #include "../../mod_fix.h" #include "../../dset.h" +#include "../../modules/tm/tm_load.h" #include "rtpproxy.h" #include "rtpproxy_funcs.h" #include "rtpproxy_stream.h" @@ -290,6 +291,9 @@ static int rtpproxy_answer1_f(struct sip_msg *, char *, char *); static int rtpproxy_answer2_f(struct sip_msg *, char *, char *); static int rtpproxy_offer1_f(struct sip_msg *, char *, char *); static int rtpproxy_offer2_f(struct sip_msg *, char *, char *); +static int rtpproxy_manage0(struct sip_msg *msg, char *flags, char *ip); +static int rtpproxy_manage1(struct sip_msg *msg, char *flags, char *ip); +static int rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip); static int add_rtpproxy_socks(struct rtpp_set * rtpp_list, char * rtpproxy); static int fixup_set_id(void ** param, int param_no); @@ -334,6 +338,9 @@ static unsigned int rtpp_no = 0; static int *rtpp_socks = 0; +/* tm */ +static struct tm_binds tmb; + /*0-> disabled, 1 ->enabled*/ unsigned int *natping_state=0; @@ -379,6 +386,15 @@ static cmd_export_t cmds[] = { {"rtpproxy_stop_stream2uas",(cmd_function)rtpproxy_stop_stream2uas2_f,0, NULL, 0, ANY_ROUTE }, + {"rtpproxy_manage", (cmd_function)rtpproxy_manage0, 0, + 0, 0, + ANY_ROUTE}, + {"rtpproxy_manage", (cmd_function)rtpproxy_manage1, 1, + 0, 0, + ANY_ROUTE}, + {"rtpproxy_manage", (cmd_function)rtpproxy_manage2, 2, + 0, 0, + ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -860,6 +876,12 @@ mod_init(void) if (rtpp_strings) pkg_free(rtpp_strings); + if (load_tm_api( &tmb ) < 0) + { + LM_DBG("could not load the TM-functions - answer-offer model" + " auto-detection is disabled\n"); + memset(&tmb, 0, sizeof(struct tm_binds)); + } return 0; } @@ -1663,6 +1685,85 @@ set_rtp_proxy_set_f(struct sip_msg * msg, char * str1, char * str2) } static int +rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) +{ + char *cp = NULL; + char newip[IP_ADDR_MAX_STR_SIZE]; + int method; + int nosdp; + + if(msg->cseq==NULL && ((parse_headers(msg, HDR_CSEQ_F, 0)==-1) + || (msg->cseq==NULL))) + { + LM_ERR("no CSEQ header\n"); + return -1; + } + + method = get_cseq(msg)->method_id; + + if(!(method==METHOD_INVITE || method==METHOD_ACK || method==METHOD_CANCEL + || method==METHOD_BYE)) + return -1; + + if(method==METHOD_CANCEL || method==METHOD_BYE) + return unforce_rtp_proxy_f(msg, 0, 0); + + if(ip==NULL) + { + cp = ip_addr2a(&msg->rcv.dst_ip); + strcpy(newip, cp); + } + + nosdp = parse_sdp(msg); + + if(msg->first_line.type == SIP_REQUEST) { + if(method==METHOD_ACK && nosdp==0) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, + (ip!=NULL)?1:0); + if(method==METHOD_INVITE && nosdp==0) { + msg->msg_flags |= FL_SDP_BODY; + if(tmb.t_gett!=NULL && tmb.t_gett()!=NULL) + tmb.t_gett()->uas.request->msg_flags |= FL_SDP_BODY; + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, + (ip!=NULL)?1:0); + } + } else if(msg->first_line.type == SIP_REPLY) { + if(msg->first_line.u.reply.statuscode>=300) + return unforce_rtp_proxy_f(msg, 0, 0); + if(nosdp==0) { + if(tmb.t_gett==NULL || tmb.t_gett()==NULL + || tmb.t_gett()==T_UNDEFINED) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, + (ip!=NULL)?1:0); + if(tmb.t_gett()->uas.request->msg_flags & FL_SDP_BODY) + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0, + (ip!=NULL)?1:0); + return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 1, + (ip!=NULL)?1:0); + } + } + return -1; +} + +static int +rtpproxy_manage0(struct sip_msg *msg, char *flags, char *ip) +{ + return rtpproxy_manage(msg, 0, 0); +} + +static int +rtpproxy_manage1(struct sip_msg *msg, char *flags, char *ip) +{ + return rtpproxy_manage(msg, flags, 0); +} + +static int +rtpproxy_manage2(struct sip_msg *msg, char *flags, char *ip) +{ + return rtpproxy_manage(msg, flags, ip); +} + +static int rtpproxy_offer1_f(struct sip_msg *msg, char *str1, char *str2) { char *cp;

1 0

git:master: rtpproxy: documented rtpproxy_manage()
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: 96db2732c5c5ee055d14fe2b0c30eac4dca31d6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96db273… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 10:09:19 2011 +0200 rtpproxy: documented rtpproxy_manage() --- modules/rtpproxy/README | 144 ++++++++++++++++--------------- modules/rtpproxy/doc/rtpproxy_admin.xml | 72 +++++++++++++++- 2 files changed, 145 insertions(+), 71 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=96d…

1 0

git:master: parser: new internal msg flag FL_SDP_BODY
by Daniel-Constantin Mierla 28 May '11

28 May '11

Module: sip-router Branch: master Commit: 05b5d0183653d936261a91e6f172ddb1e5d30037 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05b5d01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 28 08:55:02 2011 +0200 parser: new internal msg flag FL_SDP_BODY - mark the request if there is an sdp body (useful for multi-part bodies or to quickly check in tm routes as the msg body is not cloned in shm and will require parsing again) --- parser/msg_parser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 8ef60ca..30069a9 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -118,6 +118,7 @@ enum request_method { #define FL_MTU_TLS_FB (1 << 9) #define FL_MTU_SCTP_FB (1 << 10) #define FL_ADD_LOCAL_RPORT (1 << 11) /*!< add 'rport' to local via hdr */ +#define FL_SDP_BODY (1 << 12) /*!< msg has SDP in body */ /* WARNING: Value (1 << 29) is temporarily reserved for use in kamailio acc * module (flag FL_REQ_UPSTREAM)! */

1 0

git:master: rtpproxy: changed the list of allowed route blocks with ANY_ROUTE
by Daniel-Constantin Mierla 27 May '11

27 May '11

Module: sip-router Branch: master Commit: e1b0dff1dfcb2f91150a01e61523db056d889d5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1b0dff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 27 22:29:11 2011 +0200 rtpproxy: changed the list of allowed route blocks with ANY_ROUTE - functions could be used in all routes, updated the bitmask to ANY_ROUTE --- modules/rtpproxy/rtpproxy.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index d0979fc..23a8a2d 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -342,43 +342,43 @@ static str timeout_socket_str = {0, 0}; static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, fixup_set_id, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"start_recording", (cmd_function)start_recording_f, 0, 0, 0, - REQUEST_ROUTE | ONREPLY_ROUTE }, + ANY_ROUTE }, {"rtpproxy_offer", (cmd_function)rtpproxy_offer1_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer1_f, 1, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer2_f, 2, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 0, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 1, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer2_f, 2, 0, 0, - REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + ANY_ROUTE}, {"rtpproxy_stream2uac",(cmd_function)rtpproxy_stream2uac2_f, 2, fixup_var_str_int, 0, - REQUEST_ROUTE | ONREPLY_ROUTE }, + ANY_ROUTE }, {"rtpproxy_stream2uas",(cmd_function)rtpproxy_stream2uas2_f, 2, fixup_var_str_int, 0, - REQUEST_ROUTE | ONREPLY_ROUTE }, + ANY_ROUTE }, {"rtpproxy_stop_stream2uac",(cmd_function)rtpproxy_stop_stream2uac2_f,0, NULL, 0, - REQUEST_ROUTE | ONREPLY_ROUTE }, + ANY_ROUTE }, {"rtpproxy_stop_stream2uas",(cmd_function)rtpproxy_stop_stream2uas2_f,0, NULL, 0, - REQUEST_ROUTE | ONREPLY_ROUTE }, + ANY_ROUTE }, {0, 0, 0, 0, 0, 0} };

1 0

git:master: kamailio.cfg: replaced force_rtp_proxy()
by Daniel-Constantin Mierla 27 May '11

27 May '11

Module: sip-router Branch: master Commit: 78131404d62fbfc4ccbfc476d202428b5f413275 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7813140… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 27 20:34:02 2011 +0200 kamailio.cfg: replaced force_rtp_proxy() - the function has been removed, replaced with rtpproxy_offer() and rtpproxy_offer() --- etc/kamailio.cfg | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 7a545db..77cdce9 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -754,7 +754,7 @@ route[RTPPROXY] { if (is_method("BYE")) { unforce_rtp_proxy(); } else if (is_method("INVITE")){ - force_rtp_proxy(); + rtpproxy_offer(); } if (!has_totag()) add_rr_param(";nat=yes"); #!endif @@ -853,7 +853,7 @@ onreply_route[REPLY_ONE] { #!ifdef WITH_NAT if ((isflagset(FLT_NATS) || isbflagset(FLB_NATB)) && status=~"(183)|(2[0-9][0-9])") { - force_rtp_proxy(); + rtpproxy_answer(); } if (isbflagset("6")) { fix_nated_contact();

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2011