sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: modules/registrar_pcscf: firs commit of registrar_pcscf module
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: bd26883f8cf782a09dd115389b1a5cc60fdd2f83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd26883… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 22:40:27 2012 +0200 modules/registrar_pcscf: firs commit of registrar_pcscf module - registrar for P-CSCF functionality --- modules/registrar_pcscf/Makefile | 20 ++ modules/registrar_pcscf/async_reginfo.c | 168 ++++++++++++ modules/registrar_pcscf/async_reginfo.h | 81 ++++++ modules/registrar_pcscf/blurb | 44 +++ modules/registrar_pcscf/reg_mod.c | 405 ++++++++++++++++++++++++++++ modules/registrar_pcscf/reg_mod.h | 63 +++++ modules/registrar_pcscf/save.c | 354 ++++++++++++++++++++++++ modules/registrar_pcscf/save.h | 61 +++++ modules/registrar_pcscf/sem.h | 85 ++++++ modules/registrar_pcscf/service_routes.c | 429 ++++++++++++++++++++++++++++++ modules/registrar_pcscf/service_routes.h | 54 ++++ modules/registrar_pcscf/ul_callback.c | 229 ++++++++++++++++ modules/registrar_pcscf/ul_callback.h | 57 ++++ 13 files changed, 2050 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd2…

1 0

git:master: modules/registrar_scscf: first commit of registrar_scscf
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: 200082fd140bcebc7cdbf1d5511f51aa6e6f304e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=200082f… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 20:39:58 2012 +0200 modules/registrar_scscf: first commit of registrar_scscf - Registrar functionality for S-CSCF servers --- modules/registrar_scscf/CxDataType_Rel6.xsd | 293 ++++++ modules/registrar_scscf/CxDataType_Rel7.xsd | 301 ++++++ modules/registrar_scscf/Makefile | 20 + modules/registrar_scscf/api.c | 95 ++ modules/registrar_scscf/api.h | 73 ++ modules/registrar_scscf/blurb | 44 + modules/registrar_scscf/common.c | 126 +++ modules/registrar_scscf/common.h | 44 + modules/registrar_scscf/config.c | 78 ++ modules/registrar_scscf/config.h | 53 ++ modules/registrar_scscf/cxdx_avp.c | 1047 +++++++++++++++++++++ modules/registrar_scscf/cxdx_avp.h | 286 ++++++ modules/registrar_scscf/cxdx_callbacks.c | 37 + modules/registrar_scscf/cxdx_callbacks.h | 31 + modules/registrar_scscf/cxdx_sar.c | 344 +++++++ modules/registrar_scscf/cxdx_sar.h | 94 ++ modules/registrar_scscf/lookup.c | 248 +++++ modules/registrar_scscf/lookup.h | 54 ++ modules/registrar_scscf/path.c | 115 +++ modules/registrar_scscf/path.h | 43 + modules/registrar_scscf/reg_mod.c | 689 ++++++++++++++ modules/registrar_scscf/reg_mod.h | 117 +++ modules/registrar_scscf/registrar_notify.c | 1305 +++++++++++++++++++++++++++ modules/registrar_scscf/registrar_notify.h | 142 +++ modules/registrar_scscf/regpv.c | 541 +++++++++++ modules/registrar_scscf/regpv.h | 49 + modules/registrar_scscf/regtime.c | 39 + modules/registrar_scscf/regtime.h | 48 + modules/registrar_scscf/reply.c | 770 ++++++++++++++++ modules/registrar_scscf/reply.h | 84 ++ modules/registrar_scscf/rerrno.c | 35 + modules/registrar_scscf/rerrno.h | 71 ++ modules/registrar_scscf/save.c | 1270 ++++++++++++++++++++++++++ modules/registrar_scscf/save.h | 70 ++ modules/registrar_scscf/screensharing.log | 66 ++ modules/registrar_scscf/server_assignment.c | 92 ++ modules/registrar_scscf/server_assignment.h | 63 ++ modules/registrar_scscf/sip_msg.c | 284 ++++++ modules/registrar_scscf/sip_msg.h | 77 ++ modules/registrar_scscf/stats.c | 68 ++ modules/registrar_scscf/stats.h | 56 ++ modules/registrar_scscf/userdata_parser.c | 1059 ++++++++++++++++++++++ modules/registrar_scscf/userdata_parser.h | 66 ++ modules/registrar_scscf/usrloc_cb.c | 109 +++ modules/registrar_scscf/usrloc_cb.h | 55 ++ 45 files changed, 10651 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=200…

1 0

git:master: modules/isc: first commit of ISC module (IMS Service Control)
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: 49ef3f0279491020a334d93aeb7c76e723305564 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49ef3f0… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 20:36:41 2012 +0200 modules/isc: first commit of ISC module (IMS Service Control) --- modules/isc/Makefile | 20 ++ modules/isc/blurb | 44 ++++ modules/isc/checker.c | 545 +++++++++++++++++++++++++++++++++++++++++ modules/isc/checker.h | 86 +++++++ modules/isc/isc.c | 115 +++++++++ modules/isc/isc.h | 72 ++++++ modules/isc/mark.c | 293 ++++++++++++++++++++++ modules/isc/mark.h | 81 ++++++ modules/isc/mod.c | 521 +++++++++++++++++++++++++++++++++++++++ modules/isc/mod.h | 85 +++++++ modules/isc/third_party_reg.c | 253 +++++++++++++++++++ modules/isc/third_party_reg.h | 84 +++++++ 12 files changed, 2199 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=49e…

1 0

git:master: modules/auth_ims: first commit of auth_ims module
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: 1ecbbbbe2c2ee63553b47316f454ede3633a2189 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ecbbbb… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 20:29:22 2012 +0200 modules/auth_ims: first commit of auth_ims module - This module provides IMS specific authentication/authorisation functionality. --- modules/auth_ims/Makefile | 22 + modules/auth_ims/api.h | 98 +++ modules/auth_ims/authims_mod.c | 316 +++++++ modules/auth_ims/authims_mod.h | 55 ++ modules/auth_ims/authorize.c | 1447 +++++++++++++++++++++++++++++++ modules/auth_ims/authorize.h | 190 ++++ modules/auth_ims/blurb | 44 + modules/auth_ims/conversion.c | 261 ++++++ modules/auth_ims/conversion.h | 64 ++ modules/auth_ims/cxdx_avp.c | 1048 ++++++++++++++++++++++ modules/auth_ims/cxdx_avp.h | 286 ++++++ modules/auth_ims/cxdx_mar.c | 525 +++++++++++ modules/auth_ims/cxdx_mar.h | 121 +++ modules/auth_ims/doc/Makefile | 4 + modules/auth_ims/doc/auth_ims.xml | 65 ++ modules/auth_ims/doc/auth_ims_admin.xml | 509 +++++++++++ modules/auth_ims/rfc2617.c | 189 ++++ modules/auth_ims/rfc2617.h | 119 +++ modules/auth_ims/sip_messages.h | 83 ++ modules/auth_ims/stats.c | 71 ++ modules/auth_ims/stats.h | 60 ++ modules/auth_ims/utils.c | 404 +++++++++ modules/auth_ims/utils.h | 67 ++ 23 files changed, 6048 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1ec…

1 0

git:master: modules/dialog2: first version of dialog2
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: 651dafa718cb96c15781134ed280812c664bd9dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=651dafa… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 20:19:10 2012 +0200 modules/dialog2: first version of dialog2 --- modules/dialog2/Makefile | 18 + modules/dialog2/dialog.c | 785 +++++++++++++++ modules/dialog2/dlg_cb.c | 282 ++++++ modules/dialog2/dlg_cb.h | 151 +++ modules/dialog2/dlg_handlers.c | 1425 +++++++++++++++++++++++++++ modules/dialog2/dlg_handlers.h | 185 ++++ modules/dialog2/dlg_hash.c | 1751 +++++++++++++++++++++++++++++++++ modules/dialog2/dlg_hash.h | 604 ++++++++++++ modules/dialog2/dlg_load.h | 70 ++ modules/dialog2/dlg_profile.c | 865 ++++++++++++++++ modules/dialog2/dlg_profile.h | 206 ++++ modules/dialog2/dlg_req_within.c | 521 ++++++++++ modules/dialog2/dlg_req_within.h | 58 ++ modules/dialog2/dlg_timer.c | 287 ++++++ modules/dialog2/dlg_timer.h | 114 +++ modules/dialog2/dlg_var.c | 766 ++++++++++++++ modules/dialog2/dlg_var.h | 91 ++ modules/dialog2/doc/Makefile | 4 + modules/dialog2/doc/dialog2.xml | 101 ++ modules/dialog2/doc/dialog2_admin.xml | 1211 +++++++++++++++++++++++ modules/dialog2/doc/dialog2_devel.xml | 268 +++++ modules/dialog2/doc/dialog2_faq.xml | 95 ++ 22 files changed, 9858 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=651…

1 0

git:master: lib/ims: added some info to README on IMS library
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: b4189892a8fb61670da8d8c6a4fb91110e889799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b418989… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Sun Dec 30 20:10:53 2012 +0200 lib/ims: added some info to README on IMS library --- lib/README | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/README b/lib/README index 52d1881..3caf1a6 100644 --- a/lib/README +++ b/lib/README @@ -32,6 +32,10 @@ Used by modules: pa, rls, dialog, rpa trie - Common digit trie implementation for prefix matching, used by carrierroute and userblacklist +Used by IMS modules: icscf, usrloc_scscf, usrloc_pcscf, registrar_scscf, registrar_pcscf + +ims - IMS extensions helpers. Generally just getters. + Usage: -----

1 0

git:master: IMS Internal Lib: added internal kamailio library for IMS extensions
by Jason Penton 30 Dec '12

30 Dec '12

Module: sip-router Branch: master Commit: b4f41ed842766e047d286da1ceefb783f6791a5b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4f41ed… Author: root <root(a)jaybeepee-HP-EliteBook-8560w.(none)> Committer: root <root(a)jaybeepee-HP-EliteBook-8560w.(none)> Date: Sun Dec 30 19:38:57 2012 +0200 IMS Internal Lib: added internal kamailio library for IMS extensions --- lib/ims/Makefile | 21 + lib/ims/ims_getters.c | 1401 +++++++++++++++++++++++++++++++++++++ lib/ims/ims_getters.h | 414 +++++++++++ lib/ims/useful_defs.h | 84 +++ modules_k/statistics/statistics.c | 4 +- 5 files changed, 1922 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b4f…

1 0

git:pd/outbound: modules_k/rr: Fixed return from process_outbound()
by Peter Dunkley 30 Dec '12

30 Dec '12

Module: sip-router Branch: pd/outbound Commit: d274ee387a3aa27be808b11b879311793f840a40 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d274ee3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 19:31:24 2012 +0000 modules_k/rr: Fixed return from process_outbound() --- modules_k/rr/loose.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index 5699607..fac18f3 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -529,9 +529,11 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token, rcv.src_ip.af == AF_INET6 ? "]" : "", rcv.src_port, get_proto_name(rcv.proto)); + + return 1; } - return 1; + return 0; } /*!

1 0

git:pd/outbound: modules_k/rr: added decoding and using of flow token to loose_route()
by Peter Dunkley 30 Dec '12

30 Dec '12

Module: sip-router Branch: pd/outbound Commit: 4bbd8718667d5fed76b7b97b3e915647cf80e611 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bbd871… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 19:27:24 2012 +0000 modules_k/rr: added decoding and using of flow token to loose_route() --- modules_k/rr/loose.c | 179 ++++++++++++++++++++++++++++++++++---------------- 1 files changed, 122 insertions(+), 57 deletions(-) diff --git a/modules_k/rr/loose.c b/modules_k/rr/loose.c index f5d869f..5699607 100644 --- a/modules_k/rr/loose.c +++ b/modules_k/rr/loose.c @@ -486,6 +486,53 @@ static inline int find_rem_target(struct sip_msg* _m, struct hdr_field** _h, rr_ } } +/* Largest route URI is of the form: + sip:[1234:5678:9012:3456:7890:1234:5678:9012]:12345;transport=sctp + this is 66 characters long */ +#define MAX_ROUTE_URI_LEN 66 +static char uri_buf[MAX_ROUTE_URI_LEN]; + +static inline int process_outbound(struct sip_msg *_m, str flow_token, + str *dst_uri) +{ + 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) { + + /* First, force the local socket */ + si = find_si(&rcv.dst_ip, rcv.dst_port, rcv.proto); + if (si) + set_force_socket(_m, si); + else { + LM_ERR("cannot find socket from flow token\n"); + return -1; + } + + /* Second, override the destination URI */ + dst_uri->s = uri_buf; + dst_uri->len = 0; + + dst_uri->len += snprintf(dst_uri->s + dst_uri->len, + MAX_ROUTE_URI_LEN - dst_uri->len, + "sip:%s", + rcv.src_ip.af == AF_INET6 ? "[" : ""); + dst_uri->len += ip_addr2sbuf(&rcv.src_ip, + dst_uri->s + dst_uri->len, + MAX_ROUTE_URI_LEN - dst_uri->len); + dst_uri->len += snprintf(dst_uri->s + dst_uri->len, + MAX_ROUTE_URI_LEN - dst_uri->len, + "%s:%d;transport=%s", + rcv.src_ip.af == AF_INET6 ? "]" : "", + rcv.src_port, + get_proto_name(rcv.proto)); + } + + return 1; +} /*! * \brief Previous hop was a strict router, handle this case @@ -501,6 +548,7 @@ static inline int after_strict(struct sip_msg* _m) char* rem_off; str uri; struct socket_info *si; + int use_ob, next_is_strict; hdr = _m->route; rt = (rr_t*)hdr->parsed; @@ -516,7 +564,11 @@ static inline int after_strict(struct sip_msg* _m) return RR_ERROR; } - if ( enable_double_rr && is_2rr(&puri.params) && is_myself(&puri)) { + next_is_strict = is_strict(&puri.params); + if ((use_ob = process_outbound(_m, puri.user, &uri) < 0)) + 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 * send interface the one advertise in second Route */ si = grep_sock_info( &puri.host, puri.port_no, puri.proto); @@ -553,7 +605,8 @@ static inline int after_strict(struct sip_msg* _m) LM_ERR("failed to parse URI\n"); return RR_ERROR; } - } + next_is_strict = is_strict(&puri.params); + } /* set the hooks for the param * important note: RURI is already parsed by the above function, so @@ -561,7 +614,7 @@ static inline int after_strict(struct sip_msg* _m) routed_msg_id = _m->id; routed_params = _m->parsed_uri.params; - if (is_strict(&puri.params)) { + if (next_is_strict) { LM_DBG("Next hop: '%.*s' is strict router\n", uri.len, ZSW(uri.s)); /* Previous hop was a strict router and the next hop is strict * router too. There is no need to save R-URI again because it @@ -572,9 +625,11 @@ static inline int after_strict(struct sip_msg* _m) * always be a strict router because endpoints don't use ;lr parameter * In this case we will simply put the URI in R-URI and forward it, * which will work perfectly */ - if(get_maddr_uri(&uri, &puri)!=0) { - LM_ERR("failed to check maddr\n"); - return RR_ERROR; + if (!use_ob) { + if(get_maddr_uri(&uri, &puri)!=0) { + LM_ERR("failed to check maddr\n"); + return RR_ERROR; + } } if (rewrite_uri(_m, &uri) < 0) { LM_ERR("failed to rewrite request URI\n"); @@ -596,9 +651,11 @@ static inline int after_strict(struct sip_msg* _m) LM_DBG("Next hop: '%.*s' is loose router\n", uri.len, ZSW(uri.s)); - if(get_maddr_uri(&uri, &puri)!=0) { - LM_ERR("failed to check maddr\n"); - return RR_ERROR; + if (!use_ob) { + if(get_maddr_uri(&uri, &puri)!=0) { + LM_ERR("failed to check maddr\n"); + return RR_ERROR; + } } if (set_dst_uri(_m, &uri) < 0) { LM_ERR("failed to set dst_uri\n"); @@ -680,9 +737,9 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) rr_t* rt; int res; int status; - int ret; str uri; struct socket_info *si; + int uri_is_myself, use_ob, next_is_strict; hdr = _m->route; rt = (rr_t*)hdr->parsed; @@ -690,23 +747,25 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* reset rr handling static vars for safety in error case */ routed_msg_id = 0; - routed_params.s = NULL; - routed_params.len = 0; if (parse_uri(uri.s, uri.len, &puri) < 0) { LM_ERR("failed to parse the first route URI\n"); return RR_ERROR; } + 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)) + return RR_ERROR; + /* IF the URI was added by me, remove it */ - ret=is_myself(&puri); - if (ret>0) + if (uri_is_myself>0) { LM_DBG("Topmost route URI: '%.*s' is me\n", uri.len, ZSW(uri.s)); /* set the hooks for the params */ routed_msg_id = _m->id; - routed_params = puri.params; if (!rt->next) { /* No next route in the same header, remove the whole header @@ -728,59 +787,63 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) } rt = (rr_t*)hdr->parsed; } else rt = rt->next; - - if (enable_double_rr && is_2rr(&puri.params)) { - /* double route may occure due different IP and port, so force as - * send interface the one advertise in second Route */ - if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { - LM_ERR("failed to parse the double route URI\n"); - return RR_ERROR; - } - si = grep_sock_info( &puri.host, puri.port_no, puri.proto); - if (si) { - set_force_socket(_m, si); - } else { - if (enable_socket_mismatch_warning) - LM_WARN("no socket found for match second RR\n"); - } - if (!rt->next) { - /* No next route in the same header, remove the whole header - * field immediately */ - if (!del_lump(_m, hdr->name.s - _m->buf, hdr->len, 0)) { - LM_ERR("failed to remove Route HF\n"); - return RR_ERROR; - } - res = find_next_route(_m, &hdr); - if (res < 0) { - LM_ERR("failed to find next route\n"); + if (!use_ob) { + if (enable_double_rr && is_2rr(&puri.params)) { + /* double route may occure due different IP and port, so force as + * send interface the one advertise in second Route */ + if (parse_uri(rt->nameaddr.uri.s,rt->nameaddr.uri.len,&puri)<0) { + LM_ERR("failed to parse the double route URI\n"); return RR_ERROR; } - if (res > 0) { /* No next route found */ - LM_DBG("no next URI found\n"); - status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); - goto done; + si = grep_sock_info( &puri.host, puri.port_no, puri.proto); + if (si) { + set_force_socket(_m, si); + } else { + if (enable_socket_mismatch_warning) + LM_WARN("no socket found for match second RR\n"); } - rt = (rr_t*)hdr->parsed; - } else rt = rt->next; - } - - uri = rt->nameaddr.uri; - if (parse_uri(uri.s, uri.len, &puri) < 0) { - LM_ERR("failed to parse the first route URI\n"); - return RR_ERROR; + + if (!rt->next) { + /* No next route in the same header, remove the whole header + * field immediately */ + if (!del_lump(_m, hdr->name.s - _m->buf, hdr->len, 0)) { + LM_ERR("failed to remove Route HF\n"); + return RR_ERROR; + } + res = find_next_route(_m, &hdr); + if (res < 0) { + LM_ERR("failed to find next route\n"); + return RR_ERROR; + } + if (res > 0) { /* No next route found */ + LM_DBG("no next URI found\n"); + status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); + goto done; + } + rt = (rr_t*)hdr->parsed; + } else rt = rt->next; + } + + uri = rt->nameaddr.uri; + if (parse_uri(uri.s, uri.len, &puri) < 0) { + LM_ERR("failed to parse the first route URI\n"); + return RR_ERROR; + } } } else { #ifdef ENABLE_USER_CHECK /* check if it the ignored user */ - if(ret < 0) + if(uri_is_myself < 0) return NOT_RR_DRIVEN; #endif LM_DBG("Topmost URI is NOT myself\n"); + routed_params.s = NULL; + routed_params.len = 0; } LM_DBG("URI to be processed: '%.*s'\n", uri.len, ZSW(uri.s)); - if (is_strict(&puri.params)) { + if (next_is_strict) { LM_DBG("Next URI is a strict router\n"); if (handle_sr(_m, hdr, rt) < 0) { LM_ERR("failed to handle strict router\n"); @@ -790,9 +853,11 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) /* Next hop is loose router */ LM_DBG("Next URI is a loose router\n"); - if(get_maddr_uri(&uri, &puri)!=0) { - LM_ERR("checking maddr failed\n"); - return RR_ERROR; + if (!use_ob) { + if(get_maddr_uri(&uri, &puri)!=0) { + LM_ERR("checking maddr failed\n"); + return RR_ERROR; + } } if (set_dst_uri(_m, &uri) < 0) { LM_ERR("failed to set dst_uri\n");

1 0

git:pd/outbound: modules_k/outbound: changed some errors to info
by Peter Dunkley 30 Dec '12

30 Dec '12

Module: sip-router Branch: pd/outbound Commit: 5e844cf90c0d288a4038f5b2ff7cbebeab856488 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e844cf… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 18:31:07 2012 +0000 modules_k/outbound: changed some errors to info --- modules_k/outbound/ob_mod.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/outbound/ob_mod.c b/modules_k/outbound/ob_mod.c index 59c02f3..5b7b226 100644 --- a/modules_k/outbound/ob_mod.c +++ b/modules_k/outbound/ob_mod.c @@ -171,7 +171,7 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) if (flow_token.len > base64_enc_len(UNENC_FLOW_TOKEN_MAX_LENGTH)) { - LM_ERR("bad flow token length. Length is %d, expected <= %d\n", + LM_INFO("bad flow token length. Length is %d, expected <= %d\n", flow_token.len, UNENC_FLOW_TOKEN_MAX_LENGTH); return -1; } @@ -189,7 +189,7 @@ int decode_flow_token(struct receive_info *rcv, str flow_token) if (memcmp(unenc_flow_token, &hmac_sha1[SHA1_LENGTH - SHA1_80_LENGTH], SHA1_80_LENGTH) != 0) { - LM_ERR("flow token failed validation\n"); + LM_INFO("flow token failed validation\n"); return -1; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
44
Older →

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