sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:pd/outbound: modules_k/rr: bind rr to outbound module

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 7c79ef5875787a1c05d263a83c803299489308fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7c79ef5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 17:20:52 2012 +0000 modules_k/rr: bind rr to outbound module --- modules_k/rr/rr_mod.c | 24 +++++++++++++++++++++++- modules_k/rr/rr_mod.h | 4 +++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index cf0ca09..764e541 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -40,6 +40,7 @@ #include "../../mem/mem.h" #include "../../mod_fix.h" #include "../../parser/parse_rr.h" +#include "../outbound/api.h" #include "loose.h" #include "record.h" #include "rr_cb.h" @@ -56,9 +57,10 @@ int append_fromtag = 1; /*!< append from tag by default */ int enable_double_rr = 1; /*!< enable using of 2 RR by default */ int enable_full_lr = 0; /*!< compatibilty mode disabled by default */ int add_username = 0; /*!< do not add username by default */ - int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ +int enable_socket_mismatch_warning = 1; /*!< enable socket mismatch warning */ static unsigned int last_rr_msg; +ob_api_t rr_obb; MODULE_VERSION @@ -147,9 +149,22 @@ 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"); + else + { + LM_INFO("oubound module not available\n"); + memset(&rr_obb, 0, sizeof(ob_api_t)); + } + #ifdef ENABLE_USER_CHECK if(ignore_user) { + if (rr_obb.use_outbound) + { + LM_ERR("cannot use \"ignore_user\" with outbound\n"); + return -1; + } i_user.s = ignore_user; i_user.len = strlen(ignore_user); } @@ -159,6 +174,13 @@ static int mod_init(void) i_user.len = 0; } #endif + + if (add_username != 0 && rr_obb.use_outbound) + { + LM_ERR("cannot use \"add_username\" with outbound\n"); + return -1; + } + return 0; } diff --git a/modules_k/rr/rr_mod.h b/modules_k/rr/rr_mod.h index 7dc0a65..6b07ccb 100644 --- a/modules_k/rr/rr_mod.h +++ b/modules_k/rr/rr_mod.h @@ -29,6 +29,8 @@ #ifndef RR_MOD_H #define RR_MOD_H +#include "../outbound/api.h" + #ifdef ENABLE_USER_CHECK #include "../../str.h" extern str i_user; @@ -43,6 +45,6 @@ extern int enable_full_lr; /*! add username to record-route URI */ extern int add_username; extern int enable_socket_mismatch_warning; - +extern ob_api_t rr_obb; #endif /* RR_MOD_H */

11 years, 3 months

git:pd/outbound: modules_k/rr: do not double RR when outbound is in use for a request

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: d55cce8e5f2558560bf38a8ff25ddbb80f697284 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d55cce8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 17:40:08 2012 +0000 modules_k/rr: do not double RR when outbound is in use for a request --- modules_k/rr/record.c | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index fbed700..839f497 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -158,7 +158,7 @@ static inline struct lump *insert_rr_param_lump(struct lump *before, * \return 0 on success, negative on failure */ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, - str *tag, str *params, int _inbound) + str *tag, str *params, int _inbound, int _use_ob) { char* prefix, *suffix, *term, *r2; int suffix_len, prefix_len; @@ -232,7 +232,7 @@ static inline int build_rr(struct lump* _l, struct lump* _l2, str* user, _l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_ALL:SUBST_SND_ALL, 0); if (_l ==0 ) goto lump_err; - if (enable_double_rr) { + if (enable_double_rr && !_use_ob) { if (!(_l = insert_cond_lump_after(_l, COND_IF_DIFF_REALMS, 0))) goto lump_err; if (!(_l = insert_new_lump_after(_l, r2, RR_R2_LEN, 0))) @@ -307,7 +307,7 @@ int record_route(struct sip_msg* _m, str *params) rr_param_buf.len = 0; } - if (enable_double_rr) { + if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(_m))) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -320,7 +320,8 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to insert conditional lump\n"); return -6; } - if (build_rr(l, l2, &user, tag, params, OUTBOUND) < 0) { + if (build_rr(l, l2, &user, tag, params, OUTBOUND, + rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -333,7 +334,8 @@ int record_route(struct sip_msg* _m, str *params) return -3; } - if (build_rr(l, l2, &user, tag, params, INBOUND) < 0) { + if (build_rr(l, l2, &user, tag, params, INBOUND, + rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { LM_ERR("failed to insert inbound Record-Route\n"); return -4; } @@ -463,7 +465,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) #define RR_TRANS_LEN 11 #define RR_TRANS ";transport=" static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_data, - str* user, str *tag, int _inbound) + str* user, str *tag, int _inbound, int _use_ob) { char *p; char *hdr, *trans, *r2, *suffix, *term; @@ -545,7 +547,7 @@ static inline int build_advertised_rr(struct lump* _l, struct lump* _l2, str *_d goto lump_err; if (!(_l = insert_subst_lump_after(_l, _inbound?SUBST_RCV_PROTO:SUBST_SND_PROTO, 0))) goto lump_err; - if (enable_double_rr) { + if (enable_double_rr && !_use_ob) { if (!(_l = insert_cond_lump_after(_l, COND_IF_DIFF_REALMS, 0))) goto lump_err; if (!(_l = insert_new_lump_after(_l, r2, RR_R2_LEN, 0))) @@ -598,7 +600,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = &((struct to_body*)_m->from->parsed)->tag_value; } - if (enable_double_rr) { + if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(_m))) { l = anchor_lump(_m, _m->headers->name.s - _m->buf,0,HDR_RECORDROUTE_T); l2 = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, 0); if (!l || !l2) { @@ -611,7 +613,8 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) LM_ERR("failed to insert conditional lump\n"); return -4; } - if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND) < 0) { + if (build_advertised_rr(l, l2, _data, &user, tag, OUTBOUND, + rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -5; } @@ -624,7 +627,8 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) return -6; } - if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND) < 0) { + if (build_advertised_rr(l, l2, _data, &user, tag, INBOUND, + rr_obb.use_outbound ? rr_obb.use_outbound(_m) : 0) < 0) { LM_ERR("failed to insert outbound Record-Route\n"); return -7; } @@ -676,7 +680,7 @@ int add_rr_param(struct sip_msg* msg, str* rr_param) goto error; } /* double routing enabled? */ - if (enable_double_rr) { + if (enable_double_rr && !(rr_obb.use_outbound && rr_obb.use_outbound(msg))) { if (root==0 || (last_param=get_rr_param_lump(&root))==0) { LM_CRIT("failed to locate double RR lump\n"); goto error;

11 years, 3 months

git:pd/outbound: modules_k/rr: add flow token to Record-Route: headers when needed

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: acc9e5a3dde72aedbb1eeba561987c5faf80800f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=acc9e5a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 17:56:55 2012 +0000 modules_k/rr: add flow token to Record-Route: headers when needed --- modules_k/rr/record.c | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/modules_k/rr/record.c b/modules_k/rr/record.c index 839f497..5e2c418 100644 --- a/modules_k/rr/record.c +++ b/modules_k/rr/record.c @@ -289,6 +289,11 @@ int record_route(struct sip_msg* _m, str *params) LM_ERR("failed to extract username\n"); return -1; } + } 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"); + return -1; + } } if (append_fromtag) { @@ -373,6 +378,11 @@ int record_route_preset(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } + } 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"); + return -1; + } } if (append_fromtag) { @@ -590,6 +600,11 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) LM_ERR("failed to extract username\n"); return -1; } + } 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"); + return -1; + } } if (append_fromtag) {

11 years, 3 months

git:pd/outbound: Merge branch 'master' into outbound

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 724847a226cd3a5e8c2aa766a17890f06d30d6ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=724847a… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun Dec 30 17:08:43 2012 +0000 Merge branch 'master' into outbound * master: uid_gflags: default table for global attrs prefixed with uid_ libsrdb1/kamctl: added uid_global_attrs table libsrdb1/kamctl: added uid_domain and uid_domain_attrs tables srdb1/kamctl: added uid_uri and uid_uri_attrs tables uid_avp_db: default table name prefixed with uid_ srdb1/kamctl: added definition of table uid_user_attrs libsrdb1/kamctl: added definition of uid_credentials table ---

11 years, 3 months

adding ice attributes to sdp parser

by Juha Heinanen

ovidiu, do you have any comments regarding adding of ice attributes (at least candidate) to sdp parser and struct sdp_payload_attr? -- juha

11 years, 3 months

kamailio-ser merging finished

by Daniel-Constantin Mierla

Hello, in November 2008 was decided to start integration of kamailio and ser project, to get to same source code. About one year later, there was a single source code tree, but there were several duplicated modules that kept some confusion around the two projects. As the time passed, it was shown better what modules are in the focus, making the decisions to sort them out easier. The past weeks were dedicated to removing duplicated, process that just ended -- at this moment there is no duplicated module, all of them being integrated. In summary, the modules from ser that had no conflict were moved as is to modules folder, eventually after rename. The modules with conflicts were merged, adding missing features to the most developed ones, moving the others to obsolete folder. It happened that kamailio version of the modules stayed in the majority of the cases, because they had larger set of features (the core in v3.0.0 was kept from ser). Please note that the extra features from ser modules might not be in the same form, but alternatives that should offer same functionality at the end. People using ser flavour so far should start testing the master branch. Do ask questions on the mailing lists if something that you used to have in config is not longer available, so we can assist in migration and, hopefully, create a migration guide on wiki. There might few bits and pieces to tune here and there, soon we will get into code freezing period for testing the next major release, a good time for such adjustments. It is important that everyone using former ser modules to report the issues that are found. Many thanks to all those involved in integration efforts as well as in new developments that kept the project flying! Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda

11 years, 3 months

git:master: libsrdb1/kamctl: added uid_global_attrs table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e5831f5896e79ad5b878208a408d61fb374f2715 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5831f5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 29 16:39:29 2012 +0100 libsrdb1/kamctl: added uid_global_attrs table --- lib/srdb1/schema/kamailio-uid_gflags.xml | 12 + lib/srdb1/schema/uid_global_attrs.xml | 294 ++++++++++++++++++++ utils/kamctl/db_berkeley/kamailio/uid_domain | 2 - utils/kamctl/db_berkeley/kamailio/uid_domain_attrs | 2 - utils/kamctl/db_berkeley/kamailio/uid_global_attrs | 12 + utils/kamctl/db_berkeley/kamailio/version | 4 + utils/kamctl/db_sqlite/uid_gflags-create.sql | 10 + utils/kamctl/dbtext/kamailio/uid_domain | 1 - utils/kamctl/dbtext/kamailio/uid_domain_attrs | 1 - utils/kamctl/dbtext/kamailio/uid_global_attrs | 2 + utils/kamctl/dbtext/kamailio/version | 2 + utils/kamctl/mysql/uid_gflags-create.sql | 10 + utils/kamctl/oracle/uid_gflags-create.sql | 18 ++ utils/kamctl/postgres/uid_gflags-create.sql | 10 + utils/kamctl/xhttp_pi/pi_framework.xml | 24 ++ utils/kamctl/xhttp_pi/uid_gflags-mod | 14 + utils/kamctl/xhttp_pi/uid_gflags-table | 10 + 17 files changed, 422 insertions(+), 6 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e58…

11 years, 3 months

git:master: uid_gflags: default table for global attrs prefixed with uid_

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3d2c78df699a047d97f016a14c275c5559553fe5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d2c78d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 29 16:42:09 2012 +0100 uid_gflags: default table for global attrs prefixed with uid_ --- modules/uid_gflags/uid_gflags.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/uid_gflags/uid_gflags.c b/modules/uid_gflags/uid_gflags.c index 864eb39..cbd6c94 100644 --- a/modules/uid_gflags/uid_gflags.c +++ b/modules/uid_gflags/uid_gflags.c @@ -75,7 +75,7 @@ static unsigned int *gflags; static char* db_url = DEFAULT_DB_URL; static int load_global_attrs = 0; -static char* attr_table = "global_attrs"; +static char* attr_table = "uid_global_attrs"; static char* attr_name = "name"; static char* attr_type = "type"; static char* attr_value = "value";

11 years, 3 months

git:master: libsrdb1/kamctl: added uid_domain and uid_domain_attrs tables

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5eaaaf9827bb951add1f45bc5d635a4889954f73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5eaaaf9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 29 16:29:17 2012 +0100 libsrdb1/kamctl: added uid_domain and uid_domain_attrs tables --- lib/srdb1/schema/kamailio-uid_domain.xml | 13 + lib/srdb1/schema/uid_domain.xml | 253 ++++++++++++++++++++ lib/srdb1/schema/uid_domain_attrs.xml | 222 +++++++++++++++++ utils/kamctl/db_berkeley/kamailio/uid_domain | 12 + utils/kamctl/db_berkeley/kamailio/uid_domain_attrs | 12 + utils/kamctl/db_sqlite/uid_domain-create.sql | 24 ++ utils/kamctl/dbtext/kamailio/uid_domain | 2 + utils/kamctl/dbtext/kamailio/uid_domain_attrs | 2 + utils/kamctl/mysql/uid_domain-create.sql | 24 ++ utils/kamctl/oracle/uid_domain-create.sql | 40 +++ utils/kamctl/postgres/uid_domain-create.sql | 24 ++ utils/kamctl/xhttp_pi/pi_framework.xml | 48 ++++ utils/kamctl/xhttp_pi/uid_domain-mod | 28 +++ utils/kamctl/xhttp_pi/uid_domain-table | 20 ++ 14 files changed, 724 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=5ea…

11 years, 3 months

git:master: uid_avp_db: default table name prefixed with uid_

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c8b3aa436455314cc5b5591224cc2336c3060d9c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c8b3aa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Dec 29 16:00:27 2012 +0100 uid_avp_db: default table name prefixed with uid_ --- modules/uid_avp_db/uid_avp_db.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/uid_avp_db/uid_avp_db.c b/modules/uid_avp_db/uid_avp_db.c index a8b3a5d..5d3b5e4 100644 --- a/modules/uid_avp_db/uid_avp_db.c +++ b/modules/uid_avp_db/uid_avp_db.c @@ -52,8 +52,8 @@ MODULE_VERSION static char* db_url = DEFAULT_RODB_URL; /* Database URL */ -static char* user_attrs_table = "user_attrs"; -static char* uri_attrs_table = "uri_attrs"; +static char* user_attrs_table = "uid_user_attrs"; +static char* uri_attrs_table = "uid_uri_attrs"; static char* uid_column = "uid"; static char* username_column = "username"; static char* did_column = "did";

11 years, 3 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012