sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
429 discussions

git:master: core: set TOS for IPv6 UDP sockets
by Daniel-Constantin Mierla 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 084be456bc0fab015cf9964ac85651fa60ea77c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=084be45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 27 20:53:00 2013 +0100 core: set TOS for IPv6 UDP sockets - reported by Klaus Feichtinger, FS#179 --- udp_server.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/udp_server.c b/udp_server.c index 3889a65..d4efe13 100644 --- a/udp_server.c +++ b/udp_server.c @@ -321,11 +321,24 @@ int udp_init(struct socket_info* sock_info) } /* tos */ optval = tos; - if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, - sizeof(optval)) ==-1){ - LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", strerror(errno)); - /* continue since this is not critical */ + if (addr->s.sa_family==AF_INET){ + if (setsockopt(sock_info->socket, IPPROTO_IP, IP_TOS, (void*)&optval, + sizeof(optval)) ==-1){ + LOG(L_WARN, "WARNING: udp_init: setsockopt tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#ifdef USE_IPV6 + } else if (addr->s.sa_family==AF_INET6){ + if (setsockopt(sock_info->socket, IPPROTO_IPV6, IPV6_TCLASS, + (void*)&optval, sizeof(optval)) ==-1) { + LOG(L_WARN, "WARNING: udp_init: setsockopt v6 tos: %s\n", + strerror(errno)); + /* continue since this is not critical */ + } +#endif } + #if defined (__OS_linux) && defined(UDP_ERRORS) optval=1; /* enable error receiving on unconnected sockets */

1 0

[tracker] Comment added: usrloc module stops updating some records in db_mode 2
by sip-router 27 Mar '13

27 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Jordan (jordan) ---------- No, the valid record from memory is not stored in the database. Only the old expired record is in the database. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment799 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.

1 0

[tracker] Comment added: usrloc module stops updating some records in db_mode 2
by sip-router 27 Mar '13

27 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#278 - usrloc module stops updating some records in db_mode 2 User who did this - Daniel-Constantin Mierla (miconda) ---------- Got distracted a bit from this subject, caught by other tasks ... It seems that the matching_mode 2 takes in consideration 'call-id' for database operations, but not for memory operations where it uses contact and path only. That could explain why the old record is still in database, but in memory is the new one. Is the valid contact from memory also stored in database (the one with newer call-id)? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=278#comment798 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.

1 0

[tracker] Comment added: app_lua: add rpc reload command
by sip-router 27 Mar '13

27 Mar '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Daniel-Constantin Mierla (miconda) ---------- It doesn't seem that sr_lua_script_ver->len needs to be protected by a lock, it is set once, outside of any lock, at init. Then you read it inside a lock, but no other possibility to be updated at the same time. Checking if there is need to reload scripts every time a function is executed seems a bit too time consuming from my point of view. Perhaps there can be added some optimization, but that can be subject to future improvements. For the beginning it would be good to have a module parameter that enables/disables the reloading. It this way one that does not need reloading does not have to be exposed to the loops executed to detect and reload scripts for each function execution. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=270#comment797 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.

1 0

git:master: rtpproxy: add missing wrapper function for unforce_rtp_proxy
by Richard Fuchs 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 9e6af79d0cf1b0e10694880147a28966313fb5a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9e6af79… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Mar 27 13:30:05 2013 -0400 rtpproxy: add missing wrapper function for unforce_rtp_proxy --- modules/rtpproxy/rtpproxy.c | 40 +++++++++++++++++++++++++--------------- 1 files changed, 25 insertions(+), 15 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 3169fbc..169bca9 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -283,7 +283,8 @@ static int alter_mediaport(struct sip_msg *, str *, str *, str *, int); static int alter_rtcp(struct sip_msg *msg, str *body, str *oldport, str *newport); static char *gencookie(); static int rtpp_test(struct rtpp_node*, int, int); -static int unforce_rtp_proxy_f(struct sip_msg *, char *, char *); +static int unforce_rtp_proxy1_f(struct sip_msg *, char *, char *); +static int unforce_rtp_proxy(struct sip_msg *, char *); static int force_rtp_proxy(struct sip_msg *, char *, char *, int, int); static int start_recording_f(struct sip_msg *, char *, char *); static int rtpproxy_answer1_f(struct sip_msg *, char *, char *); @@ -359,16 +360,16 @@ static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, fixup_set_id, 0, ANY_ROUTE}, - {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 0, + {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy1_f, 0, 0, 0, ANY_ROUTE}, - {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy_f, 0, + {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy1_f, 0, 0, 0, ANY_ROUTE}, - {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 1, + {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy1_f, 1, fixup_spve_null, 0, ANY_ROUTE}, - {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy_f, 1, + {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy1_f, 1, fixup_spve_null, 0, ANY_ROUTE}, {"start_recording", (cmd_function)start_recording_f, 0, @@ -1800,7 +1801,21 @@ get_extra_id(struct sip_msg* msg, str *id_str) { static int -unforce_rtp_proxy_f(struct sip_msg* msg, char* str1, char* str2) +unforce_rtp_proxy1_f(struct sip_msg* msg, char* str1, char* str2) +{ + str flags; + + if (str1) + get_str_fparam(&flags, msg, (fparam_t *) str1); + else + flags.s = NULL; + + return unforce_rtp_proxy(msg, flags.s); +} + + +static int +unforce_rtp_proxy(struct sip_msg* msg, char* flags) { str callid, from_tag, to_tag, viabranch; char *cp; @@ -1810,16 +1825,11 @@ unforce_rtp_proxy_f(struct sip_msg* msg, char* str1, char* str2) str extra_id; int ret; struct rtpp_node *node; - str flags; struct iovec v[1 + 4 + 3 + 2] = {{NULL, 0}, {"D", 1}, {" ", 1}, {NULL, 0}, {NULL, 0}, {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}}; /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ - if (str1) - get_str_fparam(&flags, msg, (fparam_t *) str1); - else - flags.s = NULL; - for (cp = flags.s; cp && *cp; cp++) { + for (cp = flags; cp && *cp; cp++) { switch (*cp) { case '1': via = 1; @@ -1982,7 +1992,7 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) return -1; if(method==METHOD_CANCEL || method==METHOD_BYE) - return unforce_rtp_proxy_f(msg, flags, 0); + return unforce_rtp_proxy(msg, flags); if(ip==NULL) { @@ -2008,13 +2018,13 @@ rtpproxy_manage(struct sip_msg *msg, char *flags, char *ip) && 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, flags, 0); + return unforce_rtp_proxy(msg, flags); 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, flags, 0); + return unforce_rtp_proxy(msg, flags); if(nosdp==0) { if(method==METHOD_UPDATE) return force_rtp_proxy(msg, flags, (cp!=NULL)?newip:ip, 0,

1 0

git:master: rtpproxy: support pvars in function parameters
by Richard Fuchs 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: cd3358dd935781489e2b7122fe20a19310f97546 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd3358d… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Mar 27 12:46:28 2013 -0400 rtpproxy: support pvars in function parameters --- modules/rtpproxy/rtpproxy.c | 50 ++++++++++++++++++++++++++++++++---------- 1 files changed, 38 insertions(+), 12 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 783eff9..3169fbc 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -366,10 +366,10 @@ static cmd_export_t cmds[] = { 0, 0, ANY_ROUTE}, {"unforce_rtp_proxy", (cmd_function)unforce_rtp_proxy_f, 1, - 0, 0, + fixup_spve_null, 0, ANY_ROUTE}, {"rtpproxy_destroy", (cmd_function)unforce_rtp_proxy_f, 1, - 0, 0, + fixup_spve_null, 0, ANY_ROUTE}, {"start_recording", (cmd_function)start_recording_f, 0, 0, 0, @@ -378,19 +378,19 @@ static cmd_export_t cmds[] = { 0, 0, ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer1_f, 1, - 0, 0, + fixup_spve_null, 0, ANY_ROUTE}, {"rtpproxy_offer", (cmd_function)rtpproxy_offer2_f, 2, - 0, 0, + fixup_spve_spve, 0, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 0, 0, 0, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer1_f, 1, - 0, 0, + fixup_spve_null, 0, ANY_ROUTE}, {"rtpproxy_answer", (cmd_function)rtpproxy_answer2_f, 2, - 0, 0, + fixup_spve_spve, 0, ANY_ROUTE}, {"rtpproxy_stream2uac",(cmd_function)rtpproxy_stream2uac2_f, 2, fixup_var_str_int, 0, @@ -1800,7 +1800,7 @@ get_extra_id(struct sip_msg* msg, str *id_str) { static int -unforce_rtp_proxy_f(struct sip_msg* msg, char* flags, char* str2) +unforce_rtp_proxy_f(struct sip_msg* msg, char* str1, char* str2) { str callid, from_tag, to_tag, viabranch; char *cp; @@ -1810,10 +1810,16 @@ unforce_rtp_proxy_f(struct sip_msg* msg, char* flags, char* str2) str extra_id; int ret; struct rtpp_node *node; + str flags; struct iovec v[1 + 4 + 3 + 2] = {{NULL, 0}, {"D", 1}, {" ", 1}, {NULL, 0}, {NULL, 0}, {NULL, 0}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}}; /* 1 */ /* 2 */ /* 3 */ /* 4 */ /* 5 */ /* 6 */ /* 7 */ /* 8 */ /* 9 */ - for (cp = flags; cp && *cp; cp++) { + if (str1) + get_str_fparam(&flags, msg, (fparam_t *) str1); + else + flags.s = NULL; + + for (cp = flags.s; cp && *cp; cp++) { switch (*cp) { case '1': via = 1; @@ -2068,16 +2074,26 @@ rtpproxy_offer1_f(struct sip_msg *msg, char *str1, char *str2) { char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + str flags; cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return force_rtp_proxy(msg, str1, newip, 1, 0); + + if (str1) + get_str_fparam(&flags, msg, (fparam_t *) str1); + else + flags.s = NULL; + return force_rtp_proxy(msg, flags.s, newip, 1, 0); } static int rtpproxy_offer2_f(struct sip_msg *msg, char *param1, char *param2) { - return force_rtp_proxy(msg, param1, param2, 1, 1); + str flags, new_ip; + + get_str_fparam(&flags, msg, (fparam_t *) param1); + get_str_fparam(&new_ip, msg, (fparam_t *) param2); + return force_rtp_proxy(msg, flags.s, new_ip.s, 1, 1); } static int @@ -2085,6 +2101,7 @@ rtpproxy_answer1_f(struct sip_msg *msg, char *str1, char *str2) { char *cp; char newip[IP_ADDR_MAX_STR_SIZE]; + str flags; if (msg->first_line.type == SIP_REQUEST) if (msg->first_line.u.request.method_value != METHOD_ACK) @@ -2092,18 +2109,27 @@ rtpproxy_answer1_f(struct sip_msg *msg, char *str1, char *str2) cp = ip_addr2a(&msg->rcv.dst_ip); strcpy(newip, cp); - return force_rtp_proxy(msg, str1, newip, 0, 0); + + if (str1) + get_str_fparam(&flags, msg, (fparam_t *) str1); + else + flags.s = NULL; + return force_rtp_proxy(msg, flags.s, newip, 0, 0); } static int rtpproxy_answer2_f(struct sip_msg *msg, char *param1, char *param2) { + str flags, new_ip; + if (msg->first_line.type == SIP_REQUEST) if (msg->first_line.u.request.method_value != METHOD_ACK) return -1; - return force_rtp_proxy(msg, param1, param2, 0, 1); + get_str_fparam(&flags, msg, (fparam_t *) param1); + get_str_fparam(&new_ip, msg, (fparam_t *) param2); + return force_rtp_proxy(msg, flags.s, new_ip.s, 0, 1); }

2 2

Outbound edge proxy fixed?
by Peter Dunkley 27 Mar '13

27 Mar '13

Hello, The latest commits to outbound and rr in git master should have fixed the outbound edge proxy issues found by Olle at SIPit. I have tested this myself with some VMs and SIPp scripts (and will be doing some more testing over the next few days), but if anyone else has a setup to test this with (nudge, nudge, Olle) I'd appreciate it if you could give it a go. Thanks, Peter

2 1

git:master: modules/outbound: further improvement to the use_outbound() check
by Peter Dunkley 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: a5f8f4cd4da60168fd73d7999c09181582ec5943 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5f8f4c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:51:52 2013 +0000 modules/outbound: further improvement to the use_outbound() check --- modules/outbound/ob_mod.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index a58fdff..3f76433 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -385,6 +385,14 @@ static int use_outbound_non_reg(struct sip_msg *msg) } } + /* Check there is a single Via: */ + if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 + || msg->via2->error != PARSE_OK)) + { + LM_INFO("second Via: found - outbound not used\n"); + return 0; + } + /* Look for ;ob in Contact-URIs */ if (msg->contact || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact))

1 0

git:master: modules/rr: copy the flow-token for "incoming" messages when using outbound
by Peter Dunkley 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: 0c1725c8ccb08280a9c161e34fa9e43347cae7b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c1725c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:33:17 2013 +0000 modules/rr: copy the flow-token for "incoming" messages when using outbound --- modules/rr/record.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 64 insertions(+), 3 deletions(-) diff --git a/modules/rr/record.c b/modules/rr/record.c index e2beb19..0779200 100644 --- a/modules/rr/record.c +++ b/modules/rr/record.c @@ -37,6 +37,7 @@ #include "../../dprint.h" #include "../../parser/parse_uri.h" #include "../../parser/parse_from.h" +#include "../../parser/parse_rr.h" #include "../../str.h" #include "../../data_lump.h" #include "record.h" @@ -316,6 +317,51 @@ lump_err: return -4; } +/*! + * \brief Copy flow-token from top-Route: to a string + * + * Copy the user part of the top-Route: to a string (allocating private memory + * for this). + * \param token where the user-part of the top-Route: will be copied to + * \param _m the SIP message to extract the top-Route: from + * \return 0 on success, negative on failure + */ +static int copy_flow_token(str *token, struct sip_msg *_m) +{ + rr_t *rt; + struct sip_uri puri; + + if (_m->route + || (parse_headers(_m, HDR_ROUTE_F, 0) != -1 && _m->route)) { + if (parse_rr(_m->route) < 0) { + LM_ERR("parsing Route: header body\n"); + return -1; + } + rt = (rr_t *) _m->route->parsed; + if (!rt) { + LM_ERR("empty Route:\n"); + return -1; + } + if (parse_uri(rt->nameaddr.uri.s, rt->nameaddr.uri.len, + &puri) < 0) { + LM_ERR("parsing Route-URI\n"); + return -1; + } + + token->s = pkg_malloc(puri.user.len * sizeof(char)); + if (token->s == NULL) { + LM_ERR("allocating memory\n"); + return -1; + } + memcpy(token->s, puri.user.s, puri.user.len); + token->len = puri.user.len; + return 0; + } + + LM_ERR("no Route: headers found\n"); + return -1; +} + /*! * \brief Insert a new Record-Route header field with lr parameter @@ -345,11 +391,16 @@ int record_route(struct sip_msg* _m, str *params) return -1; } } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) { @@ -448,11 +499,16 @@ int record_route_preset(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) { @@ -682,11 +738,16 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } - } else if (use_ob) { + } else if (use_ob == 1) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { LM_ERR("encoding outbound flow-token\n"); return -1; } + } else if (use_ob == 2) { + if (copy_flow_token(&user, _m) != 0) { + LM_ERR("copying outbound flow-token\n"); + return -1; + } } if (append_fromtag) {

1 0

git:master: modules/outbound: improved check for outbound
by Peter Dunkley 27 Mar '13

27 Mar '13

Module: sip-router Branch: master Commit: b2fb355fe5c9c64727d873cbe8d6fd883ebd2537 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2fb355… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Wed Mar 27 16:32:59 2013 +0000 modules/outbound: improved check for outbound --- modules/outbound/ob_mod.c | 139 ++++++++++++++++++++++++++++++++------------ 1 files changed, 101 insertions(+), 38 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index fb110d8..a58fdff 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -206,7 +206,7 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) if (flow_token.s == NULL) { - LM_INFO("no flow-token provided\n"); + LM_DBG("no flow-token provided\n"); return -2; } @@ -275,29 +275,10 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) return 0; } -int use_outbound(struct sip_msg *msg) +static int use_outbound_register(struct sip_msg *msg) { contact_t *contact; - rr_t *rt; - struct sip_uri puri; - param_hooks_t hooks; - param_t *params; - int ret; - - /* If Outbound is forced return success without any further checks */ - if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) - { - LM_INFO("outbound forced\n"); - return 1; - } - - /* Use Outbound when there is a single Via: header and: - # It's a REGISTER request with a Contact-URI containing a ;reg-id - parameter, or - # The Contact-URI has an ;ob parameter, or - # The top Route-URI points to use and has an ;ob parameter - */ - + /* Check there is a single Via: */ if (!(parse_headers(msg, HDR_VIA2_F, 0) == -1 || msg->via2 == 0 || msg->via2->error != PARSE_OK)) @@ -306,8 +287,7 @@ int use_outbound(struct sip_msg *msg) return 0; } - /* Look for ;reg-id in REGISTER Contact-URIs and ;ob in any - Contact-URIs */ + /* Look for ;reg-id in Contact-URIs */ if (msg->contact || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact)) { @@ -323,21 +303,29 @@ int use_outbound(struct sip_msg *msg) return 0; } - if (msg->REQ_METHOD == METHOD_REGISTER && contact->reg_id) + if (contact->reg_id) { LM_INFO("found REGISTER with ;reg-id paramter on" " Contact-URI - outbound used\n"); return 1; } - if (hooks.contact.ob) - { - LM_INFO("found ;ob parameter on Contact-URI - outbound" - " used\n"); - return 1; - } } + LM_INFO("outbound not used\n"); + return 0; +} + +static int use_outbound_non_reg(struct sip_msg *msg) +{ + contact_t *contact; + rr_t *rt; + struct sip_uri puri; + param_hooks_t hooks; + param_t *params; + int ret; + struct receive_info rcv; + /* Check to see if the top Route-URI is me and has a ;ob parameter */ if (msg->route || (parse_headers(msg, HDR_ROUTE_F, 0) != -1 && msg->route)) @@ -359,13 +347,6 @@ int use_outbound(struct sip_msg *msg) LM_ERR("parsing Route-URI\n"); return 0; } - if (parse_params(&puri.params, CLASS_URI, &hooks, - &params) != 0) - { - LM_ERR("parsing Route-URI parameters\n"); - return 0; - } - ret = check_self(&puri.host, puri.port_no ? puri.port_no : SIP_PORT, 0); if (ret < 1 || (ret == 1 && puri.gr.s != NULL)) @@ -377,10 +358,65 @@ int use_outbound(struct sip_msg *msg) return 0; } + if (parse_params(&puri.params, CLASS_URI, &hooks, + &params) != 0) + { + LM_ERR("parsing Route-URI parameters\n"); + return 0; + } + if (hooks.uri.ob) { LM_INFO("found ;ob parameter on Route-URI - outbound" " used\n"); + + if (decode_flow_token(&rcv, puri.user) == 0) + { + if (!ip_addr_cmp(&rcv.src_ip, &msg->rcv.src_ip) + || rcv.src_port != msg->rcv.src_port) + { + LM_INFO("\"incoming\" request found\n"); + return 2; + } + } + + LM_INFO("\"outgoing\" request found\n"); + return 1; + } + } + + /* Look for ;ob in Contact-URIs */ + if (msg->contact + || (parse_headers(msg, HDR_CONTACT_F, 0) != -1 && msg->contact)) + { + if (parse_contact(msg->contact) < 0) + { + LM_ERR("parsing Contact: header body\n"); + return 0; + } + contact = ((contact_body_t *) msg->contact->parsed)->contacts; + if (!contact) + { + LM_ERR("empty Contact:\n"); + return 0; + } + + if (parse_uri(contact->uri.s, contact->uri.len, &puri) + < 0) + { + LM_ERR("parsing Contact-URI\n"); + return 0; + } + if (parse_params(&puri.params, CLASS_CONTACT, &hooks, &params) + != 0) + { + LM_ERR("parsing Contact-URI parameters\n"); + return 0; + } + if (hooks.contact.ob) + { + LM_INFO("found ;ob parameter on Contact-URI - outbound" + " used\n"); return 1; } } @@ -389,6 +425,33 @@ int use_outbound(struct sip_msg *msg) return 0; } +int use_outbound(struct sip_msg *msg) +{ + if (msg->first_line.type != SIP_REQUEST) + { + LM_ERR("use_outbound called for something that isn't a SIP" + " request\n"); + return 0; + } + + /* If Outbound is forced return success without any further checks */ + if (ob_force_flag != -1 && isflagset(msg, ob_force_flag) > 0) + { + LM_DBG("outbound forced\n"); + return 1; + } + + LM_INFO("Analysing %.*s for outbound markers\n", + msg->first_line.u.request.method.len, + msg->first_line.u.request.method.s); + + if (msg->REQ_METHOD == METHOD_REGISTER) + return use_outbound_register(msg); + else + return use_outbound_non_reg(msg); + +} + int bind_ob(struct ob_binds *pxb) { if (pxb == NULL)

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013