sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:pd/outbound: modules_k/rr: handle outbound failing and outbound just not being used as separate cases
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 9d9394d63c3ccdfa3ce7ba067ef29c4657f0eb37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d9394d… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 13:44:19 2012 +0000 modules_k/rr: handle outbound failing and outbound just not being used as separate cases --- modules_k/rr/loose.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 5be28fd..e110808 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -502,13 +502,22 @@ static char uri_buf[MAX_ROUTE_URI_LEN]; static inline int process_outbound(struct sip_msg *_m, str flow_token, str *dst_uri) { + int ret; struct receive_info rcv; struct socket_info *si; if (!rr_obb.decode_flow_token) return 0; - if (rr_obb.decode_flow_token(&rcv, flow_token) == 0) { + ret = rr_obb.decode_flow_token(&rcv, flow_token); + + if (ret == -2) { + LM_INFO("no flow token found - outbound not in use\n"); + return 0; + } else if (ret == -1) { + LM_ERR("failed to decode flow token\n"); + return -1; + } else { /* First, force the local socket */ si = find_si(&rcv.dst_ip, rcv.dst_port, rcv.proto); @@ -539,8 +548,6 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, return 1; } - - return 0; } /*!

1 0

git:pd/outbound: Merge branch 'master' into outbound
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 5214a6e617bfc8f2471fcf0d02d8fa5cf0a9ce3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5214a6e… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 16:08:59 2012 +0000 Merge branch 'master' into outbound * master: pkg/kamailio/(centos|fedora): Added IMS modules to RPM builds parser/sdp: added partial parsing of a=candidate attributes modules/sipcapture README: added HEPv2/v3 to supported protocols modules:siptrace changed include to hep.h Added HEPv3 (UDP) support for sipcapture. modules/registrar_pcscf: firs commit of registrar_pcscf module - registrar for P-CSCF functionality modules/registrar_scscf: first commit of registrar_scscf - Registrar functionality for S-CSCF servers modules/isc: first commit of ISC module (IMS Service Control) modules/usrloc_scscf: first commit of usrloc_scscf modules - usrloc functionality for S-CSCF servers modules/usrloc_pcscf: first commit of usrloc_pcscf module modules/auth_ims: first commit of auth_ims module - This module provides IMS specific authentication/authorisation functionality. modules/icscf: added I-CSCF module. modules/dialog2: first version of dialog2 lib/ims: added some info to README on IMS library IMS Internal Lib: added internal kamailio library for IMS extensions ---

1 0

git:pd/outbound: modules_k/outbound: filled in use_outbound() function
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: e00d77f710fe36dca08f099306c837ef7e53309f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e00d77f… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 15:36:00 2012 +0000 modules_k/outbound: filled in use_outbound() function --- modules_k/outbound/ob_mod.c | 122 ++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 116 insertions(+), 6 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 6f16b59..7234044 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -25,11 +25,15 @@ #include "../../basex.h" #include "../../dprint.h" #include "../../dset.h" +#include "../../forward.h" #include "../../ip_addr.h" #include "../../mod_fix.h" #include "../../sr_module.h" #include "../../lib/kcore/kstats_wrapper.h" #include "../../lib/kmi/mi.h" +#include "../../parser/contact/parse_contact.h" +#include "../../parser/parse_rr.h" +#include "../../parser/parse_uri.h" #include "api.h" @@ -257,18 +261,124 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) int use_outbound(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 (isbflagset(0, ob_force_bflag) > 0) + { + LM_INFO("outbound forced\n"); return 1; + } - /* Use Outbound when: - # It's an initial request (out-of-dialog INVITE, REGISTER, - SUBSCRIBE, or REFER), with - # A single Via:, and - # Top Route: points to us and has ;ob parameter _OR_ Contact: has - ;ob parameter _OR_ it's a REGISTER with ;+sip.instance + /* 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)) + { + LM_INFO("second Via: found - outbound not used\n"); + return 0; + } + + /* Look for ;reg-id in REGISTER Contact-URIs and ;ob in any + Contact-URIs */ + if (parse_headers(msg, HDR_CONTACT_F, 0) >= 0 && 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 (msg->REQ_METHOD == METHOD_REGISTER && hooks.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; + } + } + + /* Check to see if the top Route-URI is me and has a ;ob parameter */ + if (parse_headers(msg, HDR_ROUTE_F, 0) >= 0 && msg->route) + { + if (parse_rr(msg->route) < 0) + { + LM_ERR("parsing Route: header body\n"); + return 0; + } + rt = (rr_t *) msg->route->parsed; + if (!rt) + { + LM_ERR("empty Route:\n"); + return 0; + } + if (parse_uri(rt->nameaddr.uri.s, rt->nameaddr.uri.len, + &puri) < 0) + { + 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)) + { + /* If the host:port doesn't match, or does but it's + gruu */ + LM_INFO("top Route-URI is not me - outbound not" + " used\n"); + return 0; + } + + if (hooks.uri.ob) + { + LM_INFO("found ;ob parameter on Route-URI - outbound" + " used\n"); + return 1; + } + } + + LM_INFO("outbound not used\n"); return 0; }

1 0

git:pd/outbound: core: added parsing of ; ob for URIs and Contact: headers
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 488bf3c94b2498e7539638202ee878c237fde567 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=488bf3c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 15:35:32 2012 +0000 core: added parsing of ;ob for URIs and Contact: headers --- parser/parse_param.c | 18 +++++++++++++++++- parser/parse_param.h | 5 ++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index 16e27d5..ac22387 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -152,7 +152,7 @@ static inline void parse_contact_class(param_hooks_t* _h, param_t* _p) _h->contact.methods = _p; } break; - + case 'r': case 'R': if ((_p->name.len == 8) && @@ -172,6 +172,14 @@ static inline void parse_contact_class(param_hooks_t* _h, param_t* _p) _h->contact.instance = _p; } break; + case 'o': + case 'O': + if ((_p->name.len == 2) && + (!strncasecmp(_p->name.s + 1, "b", 1))) { + _p->type = P_OB; + _h->contact.ob = _p; + } + break; } } @@ -252,6 +260,14 @@ static inline void parse_uri_class(param_hooks_t* _h, param_t* _p) _h->uri.ftag = _p; } break; + case 'o': + case 'O': + if ((_p->name.len == 2) && + (!strncasecmp(_p->name.s + 1, "b", 1))) { + _p->type = P_OB; + _h->uri.ob = _p; + } + break; } } diff --git a/parser/parse_param.h b/parser/parse_param.h index db7f401..d544f62 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -69,7 +69,8 @@ typedef enum ptype { P_TO_TAG, /*!< Dialog event package: to-tag */ P_ISD, /*!< Dialog event package: include-session-description */ P_SLA, /*!< Dialog event package: sla */ - P_MA /*!< Dialog event package: ma */ + P_MA, /*!< Dialog event package: ma */ + P_OB /*!< Contact|URI: ob parameter */ } ptype_t; @@ -106,6 +107,7 @@ struct contact_hooks { struct param* received; /*!< received parameter */ struct param* instance; /*!< sip.instance parameter */ struct param* reg_id; /*!< reg-id parameter */ + struct param* ob; /*!< ob parameter */ }; @@ -121,6 +123,7 @@ struct uri_hooks { struct param* dstip; /*!< Destination IP */ struct param* dstport; /*!< Destination port */ struct param* ftag; /*!< From tag in the original request */ + struct param* ob; /*!< ob parameter */ };

1 0

git:pd/outbound: modules_k/rr: updated documentation for outbound support
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: a0a23aacc9a2d19b30f62702811c1eadc5671d98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0a23aa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 13:28:06 2012 +0000 modules_k/rr: updated documentation for outbound support --- modules_k/rr/README | 133 ++++++++++++++++++++++++---------------- modules_k/rr/doc/rr_admin.xml | 34 ++++++++++- 2 files changed, 113 insertions(+), 54 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a0a…

1 0

git:pd/outbound: modules_k/outbound: tightened up error handling in decode_flow_token()
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 5ceef3cb48fc4b1e9c75abf91ba45f59f5125751 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ceef3c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 12:54:37 2012 +0000 modules_k/outbound: tightened up error handling in decode_flow_token() --- modules_k/outbound/ob_mod.c | 27 ++++++++++++++++++++++----- 1 files changed, 22 insertions(+), 5 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 5b7b226..c9e55eb 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -95,8 +95,8 @@ static int mod_init(void) /* Structure of flow token <HMAC-SHA1-80><protocol><dst_ip><dst_port><src_ip><src_port> - 10 + 1 + 16 + 2 + 16 + 2 - = 47 bytes maximum + 10 + 1 + 4or16 + 2 + 16 + 2 + = 35 bytes minimum and 47 bytes maximum <protocol> specifies whether the addresses are IPv4 or IPv6 and the transport. @@ -105,9 +105,11 @@ static int mod_init(void) IP addresses will be 4 (for IPv6) or 16 (for IPv6) bytes. + Minimum base64 encoded size: ceiling((35+2)/3)*4 = 52 bytes Maximum base64 encoded size: ceiling((47+2)/3)*4 = 68 bytes */ +#define UNENC_FLOW_TOKEN_MIN_LENGTH 35 #define UNENC_FLOW_TOKEN_MAX_LENGTH 47 #define SHA1_LENGTH 20 #define SHA1_80_LENGTH 10 @@ -169,10 +171,25 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) { int pos = FLOW_TOKEN_START_POS, flow_length, i; - if (flow_token.len > base64_enc_len(UNENC_FLOW_TOKEN_MAX_LENGTH)) + if (rcv == NULL) { - LM_INFO("bad flow token length. Length is %d, expected <= %d\n", - flow_token.len, UNENC_FLOW_TOKEN_MAX_LENGTH); + LM_ERR("bad receive_info structure provided\n"); + return -1; + } + + if (flow_token.s == NULL) + { + LM_INFO("no flow token provided\n"); + return -1; + } + + if (flow_token.len != base64_enc_len(UNENC_FLOW_TOKEN_MIN_LENGTH) + && flow_token.len != base64_enc_len(UNENC_FLOW_TOKEN_MAX_LENGTH)) + { + LM_INFO("bad flow token length. Length is %d, expected %d" + " or %d.\n", flow_token.len, + UNENC_FLOW_TOKEN_MIN_LENGTH, + UNENC_FLOW_TOKEN_MAX_LENGTH); return -1; }

1 0

git:pd/outbound: modules_k/rr: tidied up error handling and comments relating to outbound
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 6141b16fc5f619938472f6f56d0fb2e0e5456aee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6141b16… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 12:55:06 2012 +0000 modules_k/rr: tidied up error handling and comments relating to outbound --- modules_k/rr/loose.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index fac18f3..01d95e4 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -492,6 +492,13 @@ static inline int find_rem_target(struct sip_msg* _m, struct hdr_field** _h, rr_ #define MAX_ROUTE_URI_LEN 66 static char uri_buf[MAX_ROUTE_URI_LEN]; +/*! + * \brief Perform outbound processing - force local socket and set destination URI + * \param _m SIP message + * \param flow_token string containing the flow token extracted from the Route: header + * \param dst_uri string to write the destination URI to (extracted from flow token) + * \return -1 on error, 0 when outbound not in use, 1 when outbound in use + */ static inline int process_outbound(struct sip_msg *_m, str flow_token, str *dst_uri) { @@ -567,8 +574,10 @@ static inline int after_strict(struct sip_msg* _m) } next_is_strict = is_strict(&puri.params); - if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) + if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) { + LM_ERR("processing outbound flow token\n"); return RR_ERROR; + } if (!use_ob && enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) { /* double route may occure due different IP and port, so force as @@ -758,8 +767,10 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) next_is_strict = is_strict(&puri.params); routed_params = puri.params; uri_is_myself = is_myself(&puri); - if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) + if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) { + LM_ERR("processing outbound flow token\n"); return RR_ERROR; + } /* IF the URI was added by me, remove it */ if (uri_is_myself>0)

1 0

git:pd/outbound: modules_k/rr: fixed typos in diagnostics and comments
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: 7d6d7f177f465e184e1ef612a82a7406ccadd45a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7d6d7f1… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 13:25:36 2012 +0000 modules_k/rr: fixed typos in diagnostics and comments --- modules_k/rr/loose.c | 10 +++++----- modules_k/rr/record.c | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 01d95e4..5be28fd 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -495,8 +495,8 @@ static char uri_buf[MAX_ROUTE_URI_LEN]; /*! * \brief Perform outbound processing - force local socket and set destination URI * \param _m SIP message - * \param flow_token string containing the flow token extracted from the Route: header - * \param dst_uri string to write the destination URI to (extracted from flow token) + * \param flow_token string containing the flow-token extracted from the Route: header + * \param dst_uri string to write the destination URI to (extracted from flow-token) * \return -1 on error, 0 when outbound not in use, 1 when outbound in use */ static inline int process_outbound(struct sip_msg *_m, str flow_token, @@ -515,7 +515,7 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, if (si) set_force_socket(_m, si); else { - LM_ERR("cannot find socket from flow token\n"); + LM_ERR("cannot find socket from flow-token\n"); return -1; } @@ -575,7 +575,7 @@ static inline int after_strict(struct sip_msg* _m) next_is_strict = is_strict(&puri.params); if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) { - LM_ERR("processing outbound flow token\n"); + LM_ERR("processing outbound flow-token\n"); return RR_ERROR; } @@ -768,7 +768,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) routed_params = puri.params; uri_is_myself = is_myself(&puri); if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) { - LM_ERR("processing outbound flow token\n"); + LM_ERR("processing outbound flow-token\n"); return RR_ERROR; } diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index 5e2c418..394f0a1 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -291,7 +291,7 @@ int record_route(struct sip_msg* _m, str *params) } } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { - LM_ERR("encoding outbound flow token\n"); + LM_ERR("encoding outbound flow-token\n"); return -1; } } @@ -380,7 +380,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) } } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { - LM_ERR("encoding outbound flow token\n"); + LM_ERR("encoding outbound flow-token\n"); return -1; } } @@ -602,7 +602,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) } } else if (rr_obb.use_outbound && rr_obb.use_outbound(_m)) { if (rr_obb.encode_flow_token(&user, _m->rcv) != 0) { - LM_ERR("encoding outbound flow token\n"); + LM_ERR("encoding outbound flow-token\n"); return -1; } }

1 0

git:pd/outbound: modules_k/path: fixed a typo in a diagnostic message
by Peter Dunkley 31 Dec '12

31 Dec '12

Module: sip-router Branch: pd/outbound Commit: a0dd2a75dc763ebb5907573aac3b8653c5faf93a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0dd2a7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Dec 31 13:25:01 2012 +0000 modules_k/path: fixed a typo in a diagnostic message --- modules_k/path/path.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/path/path.c b/modules_k/path/path.c index b702ba4..b5dc92b 100644 --- a/modules_k/path/path.c +++ b/modules_k/path/path.c @@ -204,7 +204,7 @@ int add_path(struct sip_msg* _msg, char* _a, char* _b) if (path_obb.use_outbound != NULL && path_obb.use_outbound(_msg)) { if (path_obb.encode_flow_token(&user, _msg->rcv) != 0) { - LM_ERR("encoding outbound flow token\n"); + LM_ERR("encoding outbound flow-token\n"); return -1; }

1 0

Happy New Year!
by Olle E. Johansson 31 Dec '12

31 Dec '12

Friends, A Happy New Year to you all! I look forward to the new year with the new release, the Kamailio World Conference and many hacks, discussions, broken and working patches and hopefully cool projects. Best regards, /Olle

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012