sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

git:master: tm: fixed warning related to failure branch routing block execution

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8e644b8e1ccd9c4d6383a2863f9bf247f789a987 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e644b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 13 11:00:08 2013 +0200 tm: fixed warning related to failure branch routing block execution - routing blocks id are >=1, the condition was always true because the field in tm struct is unsigned int - gcc warning was: comparison is always true due to limited range of data type --- modules/tm/t_reply.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index ce36710..0904d7d 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1339,7 +1339,7 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, * save of the final reply per branch */ Trans->uac[branch].reply = reply; if (unlikely(has_tran_tmcbs( Trans, TMCB_ON_BRANCH_FAILURE_RO|TMCB_ON_BRANCH_FAILURE) - || (Trans->uac[picked_branch].on_branch_failure >= 0) )) { + || (Trans->uac[picked_branch].on_branch_failure) )) { extra_flags= ((Trans->uac[branch].request.flags & F_RB_TIMEOUT)? FL_TIMEOUT:0) |

11 years, 4 months

git:master: modules/outbound: reduced the level of some outbound related diagnostics

by Peter Dunkley

Module: sip-router Branch: master Commit: 0ca1a789e52e5d559983c3cfb4d851ae375c7758 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ca1a78… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 14:18:13 2013 +0100 modules/outbound: reduced the level of some outbound related diagnostics --- modules/outbound/ob_mod.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 6180ec2..63be739 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -224,7 +224,7 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t if (flow_token.len == 0) { - LM_ERR("no flow-token found\n"); + LM_DBG("no flow-token found\n"); return -2; } @@ -234,7 +234,7 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t if (flow_length != UNENC_FLOW_TOKEN_MIN_LENGTH && flow_length != UNENC_FLOW_TOKEN_MAX_LENGTH) { - LM_INFO("no flow-token found - bad length (%d)\n", flow_length); + LM_DBG("no flow-token found - bad length (%d)\n", flow_length); return -2; } @@ -249,13 +249,13 @@ int decode_flow_token(struct sip_msg *msg, struct receive_info **rcv, str flow_t flow_length - FLOW_TOKEN_START_POS, hmac_sha1, NULL) == NULL) { - LM_ERR("HMAC-SHA1 failed\n"); + LM_INFO("HMAC-SHA1 failed\n"); return -1; } 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; } @@ -472,7 +472,8 @@ int use_outbound(struct sip_msg *msg) return 1; } - /* If Outbound is turned off, return failure without any further checks */ + /* If Outbound is turned off, return failure without any further + checks */ if (ob_force_no_flag != -1 && isflagset(msg, ob_force_no_flag) > 0) { LM_DBG("outbound not used by force\n");

11 years, 4 months

git:master: modules/rr: reduced the level of some outbound related diagnostics

by Peter Dunkley

Module: sip-router Branch: master Commit: b0b3887b099fd16906d9e42fcc05d2f899574426 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0b3887… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 14:17:55 2013 +0100 modules/rr: reduced the level of some outbound related diagnostics --- modules/rr/loose.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/rr/loose.c b/modules/rr/loose.c index e9d9a43..c1b669c 100644 --- a/modules/rr/loose.c +++ b/modules/rr/loose.c @@ -517,7 +517,7 @@ static inline int process_outbound(struct sip_msg *_m, str flow_token) LM_DBG("no flow token found - outbound not in use\n"); return 0; } else if (ret == -1) { - LM_ERR("failed to decode flow token\n"); + LM_INFO("failed to decode flow token\n"); return -1; } else if (!ip_addr_cmp(&rcv->src_ip, &_m->rcv.src_ip) || rcv->src_port != _m->rcv.src_port) { @@ -529,7 +529,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_INFO("cannot find socket from flow-token\n"); return -1; } @@ -792,7 +792,7 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) routed_msg_id = _m->id; if ((use_ob = process_outbound(_m, puri.user)) < 0) { - LM_ERR("processing outbound flow-token\n"); + LM_INFO("failed to process outbound flow-token\n"); return FLOW_TOKEN_BROKEN; }

11 years, 4 months

git:master: modules/rr: reduced the level of an outbound related diagnostic message

by Peter Dunkley

Module: sip-router Branch: master Commit: 4fafe7bd6d781748722de4fb565808063c8f6c4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fafe7b… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 14:10:24 2013 +0100 modules/rr: reduced the level of an outbound related diagnostic message --- modules/rr/rr_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rr/rr_mod.c b/modules/rr/rr_mod.c index 5782c26..1628f3b 100644 --- a/modules/rr/rr_mod.c +++ b/modules/rr/rr_mod.c @@ -153,7 +153,7 @@ struct module_exports exports = { static int mod_init(void) { if (ob_load_api(&rr_obb) == 0) - LM_INFO("Bound rr module to outbound module\n"); + LM_DBG("Bound rr module to outbound module\n"); else { LM_INFO("outbound module not available\n");

11 years, 4 months

git:master: modules/path: reduced the level of an outbound related diagnostic message

by Peter Dunkley

Module: sip-router Branch: master Commit: ee2847c5f508fc8757221e5772c03b62d07f172a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee2847c… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 14:09:58 2013 +0100 modules/path: reduced the level of an outbound related diagnostic message --- modules/path/path_mod.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/path/path_mod.c b/modules/path/path_mod.c index 0da11ae..25eda71 100644 --- a/modules/path/path_mod.c +++ b/modules/path/path_mod.c @@ -142,7 +142,7 @@ static int mod_init(void) } if (ob_load_api(&path_obb) == 0) - LM_INFO("Bound path module to outbound module\n"); + LM_DBG("Bound path module to outbound module\n"); else { LM_INFO("outbound module not available\n"); memset(&path_obb, 0, sizeof(ob_api_t));

11 years, 4 months

git:master: modules/websocket: Added check to stop Kamailio starting if WebSocket is loaded without xhttp

by Peter Dunkley

Module: sip-router Branch: master Commit: 116ba23c60be15f5fdc1e0cf0f9a9a7affdd32b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=116ba23… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 14:09:28 2013 +0100 modules/websocket: Added check to stop Kamailio starting if WebSocket is loaded without xhttp --- modules/websocket/ws_mod.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/websocket/ws_mod.c b/modules/websocket/ws_mod.c index c6331f7..ea1e23a 100644 --- a/modules/websocket/ws_mod.c +++ b/modules/websocket/ws_mod.c @@ -272,6 +272,12 @@ static int mod_init(void) } cfg_get(websocket, ws_cfg, keepalive_timeout) = ws_keepalive_timeout; + if (!module_loaded("xhttp")) + { + LM_ERR("\"xhttp\" must be loaded to use WebSocket.\n"); + return -1; + } + if (!module_loaded("nathelper") && !module_loaded("outbound")) { LM_WARN("neither \"nathelper\" nor \"outbound\" modules are"

11 years, 4 months

git:master: modules/presence: downgraded unsupported event syslog message

by Juha Heinanen

Module: sip-router Branch: master Commit: afdae93c5eba15496498be292c0c99608d801757 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=afdae93… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 12 16:10:40 2013 +0300 modules/presence: downgraded unsupported event syslog message - Downgraded unsupported event syslog message from error to notice. --- modules/presence/subscribe.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/presence/subscribe.c b/modules/presence/subscribe.c index 655f1d3..aff55f3 100644 --- a/modules/presence/subscribe.c +++ b/modules/presence/subscribe.c @@ -1026,8 +1026,8 @@ int handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_domain) bad_event: if (parsed_event && parsed_event->name.s) - LM_ERR("Unsupported event header field value %.*s\n", - parsed_event->name.len,parsed_event->name.s); + LM_NOTICE("Unsupported presence event %.*s\n", + parsed_event->name.len,parsed_event->name.s); else LM_ERR("Missing event header field value\n");

11 years, 4 months

git:master: modules/msrp: Use "msrps://" URIs for the server when TLS is loaded. TLS is mandatory for MSRP relays.

by Peter Dunkley

Module: sip-router Branch: master Commit: 116daef9b55d82a016d1fd3e3d877a2468c55d1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=116daef… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 13:57:44 2013 +0100 modules/msrp: Use "msrps://" URIs for the server when TLS is loaded. TLS is mandatory for MSRP relays. --- modules/msrp/msrp_cmap.c | 3 ++- modules/msrp/msrp_vars.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/msrp/msrp_cmap.c b/modules/msrp/msrp_cmap.c index 3e4c351..5ae3b0c 100644 --- a/modules/msrp/msrp_cmap.c +++ b/modules/msrp/msrp_cmap.c @@ -31,6 +31,7 @@ #include "../../lib/srutils/sruid.h" #include "../../rpc.h" #include "../../rpc_lookup.h" +#include "../../sr_module.h" #include "msrp_netio.h" #include "msrp_env.h" @@ -211,7 +212,7 @@ int msrp_cmap_save(msrp_frame_t *mf) idx = msrp_get_slot(hid, _msrp_cmap_head->mapsize); srcaddr.s = sbuf;; - if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS) + if (module_loaded("tls")) { memcpy(srcaddr.s, "msrps://", 8); srcaddr.s+=8; diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 939cfb2..673b20d 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -31,6 +31,7 @@ #include "../../trim.h" #include "../../ut.h" #include "../../pvapi.h" +#include "../../sr_module.h" #include "msrp_parser.h" #include "msrp_vars.h" @@ -273,7 +274,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) return pv_get_null(msg, param, res); s.s = pv_get_buffer(); p = s.s; - if(mf->tcpinfo->rcv->proto==PROTO_TLS || mf->tcpinfo->rcv->proto==PROTO_WSS) + if (module_loaded("tls")) { memcpy(p, "msrps://", 8); p+=8;

11 years, 4 months

git:master: modules/outbound: added warning message when outbound module is loaded in a configuraiton that does not load the stun module

by Peter Dunkley

Module: sip-router Branch: master Commit: 2bb07b9d2df567e24f86b291bee7748db104252b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bb07b9… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 13:54:59 2013 +0100 modules/outbound: added warning message when outbound module is loaded in a configuraiton that does not load the stun module --- modules/outbound/ob_mod.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index a2b6d12..6180ec2 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -107,12 +107,21 @@ static int mod_init(void) LM_ERR("unable to get %d cryptographically strong pseudo-" "random bytes\n", ob_key.len); } + if (cfg_declare("outbound", outbound_cfg_def, &default_outbound_cfg, - cfg_sizeof(outbound), &outbound_cfg)) { + cfg_sizeof(outbound), &outbound_cfg)) + { LM_ERR("declaring config framework variable\n"); return -1; } default_outbound_cfg.outbound_active = 1; + + if (!module_loaded("stun")) + { + LM_WARN("\"stun\" module is not loaded. STUN is required to use" + " outbound with UDP.\n"); + } + return 0; }

11 years, 4 months

git:master: modules/msrp: added warning when MSRP is loaded in a configuration without TLS. TLS is mandatory for MSRP relays.

by Peter Dunkley

Module: sip-router Branch: master Commit: 30c8ead0b18678950b7596d4247d51cb56614d42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=30c8ead… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 12 13:57:00 2013 +0100 modules/msrp: added warning when MSRP is loaded in a configuration without TLS. TLS is mandatory for MSRP relays. --- modules/msrp/msrp_mod.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/msrp/msrp_mod.c b/modules/msrp/msrp_mod.c index 3204dfc..edc4666 100644 --- a/modules/msrp/msrp_mod.c +++ b/modules/msrp/msrp_mod.c @@ -165,7 +165,15 @@ static int mod_init(void) msrp_timer_interval = 60; register_sync_timers(1); } + sr_event_register_cb(SREV_TCP_MSRP_FRAME, msrp_frame_received); + + if(!module_loaded("tls")) { + LM_WARN("\"tls\" module is not loaded. TLS is mandatory for" + " MSRP Relays. To comply with RFC 4976 you must use" + " TLS.\n"); + } + return 0; }

11 years, 4 months

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013