sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

git:master: auth_*(s): updated auth_api and header file name

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 5e4d570b5d469203303f0f27c5aef3d768001aaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e4d570… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 17:25:05 2010 +0200 auth_*(s): updated auth_api and header file name Changed auth_api_t to auth_api_s_t and bind_auth to bind_auth_s in all the auth(s) using modules. Updated also the auth/api.h path to contain modules_s (safer if the modules will be moved). --- modules_s/auth_db/authdb_mod.c | 8 ++++---- modules_s/auth_db/authdb_mod.h | 4 ++-- modules_s/auth_radius/authorize.c | 2 +- modules_s/auth_radius/authrad_mod.c | 6 +++--- modules_s/auth_radius/authrad_mod.h | 4 ++-- modules_s/auth_radius/sterman.c | 2 +- modules_s/osp/orig_transaction.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules_s/auth_db/authdb_mod.c b/modules_s/auth_db/authdb_mod.c index 99747a2..227420c 100644 --- a/modules_s/auth_db/authdb_mod.c +++ b/modules_s/auth_db/authdb_mod.c @@ -45,7 +45,7 @@ #include "../../mem/mem.h" #include "authorize.h" #include "../auth/aaa_avps.h" -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "authdb_mod.h" MODULE_VERSION @@ -106,7 +106,7 @@ int use_did = 0; int check_all = 0; db_ctx_t* auth_db_handle = 0; /* database connection handle */ -auth_api_t auth_api; +auth_api_s_t auth_api; str credentials_list = STR_STATIC_INIT(DEFAULT_CRED_LIST); @@ -262,11 +262,11 @@ err: static int mod_init(void) { - bind_auth_t bind_auth; + bind_auth_s_t bind_auth; DBG("auth_db module - initializing\n"); - bind_auth = (bind_auth_t)find_export("bind_auth", 0, 0); + bind_auth = (bind_auth_s_t)find_export("bind_auth_s", 0, 0); if (!bind_auth) { LOG(L_ERR, "auth_db:mod_init: Unable to find bind_auth function\n"); return -1; diff --git a/modules_s/auth_db/authdb_mod.h b/modules_s/auth_db/authdb_mod.h index 7715045..95f6a80 100644 --- a/modules_s/auth_db/authdb_mod.h +++ b/modules_s/auth_db/authdb_mod.h @@ -33,7 +33,7 @@ #include "../../str.h" #include "../../lib/srdb2/db.h" -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "../sl/sl.h" #include "../../parser/msg_parser.h" @@ -56,7 +56,7 @@ extern int check_all; /* if set to 1, multiple db entries are checked */ extern db_ctx_t* auth_db_handle; /* database connection handle */ -extern auth_api_t auth_api; +extern auth_api_s_t auth_api; extern str* credentials; extern int credentials_n; diff --git a/modules_s/auth_radius/authorize.c b/modules_s/auth_radius/authorize.c index 1b88a5f..9099303 100644 --- a/modules_s/auth_radius/authorize.c +++ b/modules_s/auth_radius/authorize.c @@ -45,7 +45,7 @@ #include "../../dprint.h" #include "../../id.h" #include "../../ut.h" -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "authorize.h" #include "sterman.h" #include "authrad_mod.h" diff --git a/modules_s/auth_radius/authrad_mod.c b/modules_s/auth_radius/authrad_mod.c index a0fa668..0cd403b 100644 --- a/modules_s/auth_radius/authrad_mod.c +++ b/modules_s/auth_radius/authrad_mod.c @@ -58,7 +58,7 @@ struct attr attrs[A_MAX]; struct val vals[V_MAX]; void *rh; -auth_api_t auth_api; +auth_api_s_t auth_api; static int mod_init(void); /* Module initialization function */ @@ -119,7 +119,7 @@ struct module_exports exports = { static int mod_init(void) { DICT_VENDOR *vend; - bind_auth_t bind_auth; + bind_auth_s_t bind_auth; DBG("auth_radius - Initializing\n"); @@ -182,7 +182,7 @@ static int mod_init(void) } - bind_auth = (bind_auth_t)find_export("bind_auth", 0, 0); + bind_auth = (bind_auth_s_t)find_export("bind_auth_s", 0, 0); if (!bind_auth) { LOG(L_ERR, "auth_radius: Unable to find bind_auth function\n"); return -1; diff --git a/modules_s/auth_radius/authrad_mod.h b/modules_s/auth_radius/authrad_mod.h index 9467c73..116c7bf 100644 --- a/modules_s/auth_radius/authrad_mod.h +++ b/modules_s/auth_radius/authrad_mod.h @@ -35,7 +35,7 @@ #ifndef AUTHRAD_MOD_H #define AUTHRAD_MOD_H -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "../../rad_dict.h" extern struct attr attrs[]; @@ -45,6 +45,6 @@ extern void *rh; extern int use_did; extern int use_ruri_flag; -extern auth_api_t auth_api; +extern auth_api_s_t auth_api; #endif /* AUTHRAD_MOD_H */ diff --git a/modules_s/auth_radius/sterman.c b/modules_s/auth_radius/sterman.c index b753f0e..11ba189 100644 --- a/modules_s/auth_radius/sterman.c +++ b/modules_s/auth_radius/sterman.c @@ -34,7 +34,7 @@ #include "../../mem/mem.h" #include "../../dprint.h" -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "../../rad_dict.h" #include "../../usr_avp.h" #include "../../ut.h" diff --git a/modules_s/osp/orig_transaction.c b/modules_s/osp/orig_transaction.c index 905b770..8ab4cd8 100644 --- a/modules_s/osp/orig_transaction.c +++ b/modules_s/osp/orig_transaction.c @@ -38,7 +38,7 @@ #include "../../dset.h" #include "../../usr_avp.h" #include "../../mem/mem.h" -#include "../auth/api.h" +#include "../../modules_s/auth/api.h" #include "orig_transaction.h" #include "destination.h" #include "osptoolkit.h" @@ -49,7 +49,7 @@ extern char* _osp_device_ip; extern char* _osp_device_port; extern int _osp_max_dests; extern OSPTPROVHANDLE _osp_provider; -extern auth_api_t osp_auth; +extern auth_api_s_t osp_auth; extern int _osp_redir_uri; const int OSP_FIRST_ROUTE = 1;

14 years, 5 months

git:master: auth_radius, misc_radius: mv back to modules_k

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 994b75e5f942e31675253356e2303d0dbea03890 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=994b75e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 16:26:48 2010 +0200 auth_radius,misc_radius: mv back to modules_k Partially revert 456c3c137e9abcf687413f9675fe0f1761ce820d: move modules/{auth_radius,misc_radius} back to modules_k to allow having 2 sets of radius modules (ser & kamailio). This is needed because the ser and kamailio auth apis (exported by modules*/auth) are incompatible and hence auth api using modules cannot be mixed. --- {modules => modules_k}/auth_radius/Makefile | 0 {modules => modules_k}/auth_radius/README | 0 {modules => modules_k}/auth_radius/authorize.c | 0 {modules => modules_k}/auth_radius/authorize.h | 0 {modules => modules_k}/auth_radius/authrad_mod.c | 0 {modules => modules_k}/auth_radius/authrad_mod.h | 0 {modules => modules_k}/auth_radius/doc/Makefile | 0 .../auth_radius/doc/auth_radius.xml | 0 .../auth_radius/doc/auth_radius_admin.xml | 0 {modules => modules_k}/auth_radius/extra.c | 0 {modules => modules_k}/auth_radius/extra.h | 0 {modules => modules_k}/auth_radius/sterman.c | 0 {modules => modules_k}/auth_radius/sterman.h | 0 {modules => modules_k}/misc_radius/Makefile | 0 {modules => modules_k}/misc_radius/README | 0 {modules => modules_k}/misc_radius/doc/Makefile | 0 .../misc_radius/doc/misc_radius.xml | 0 .../misc_radius/doc/misc_radius_admin.xml | 0 {modules => modules_k}/misc_radius/extra.c | 0 {modules => modules_k}/misc_radius/extra.h | 0 {modules => modules_k}/misc_radius/functions.c | 0 {modules => modules_k}/misc_radius/functions.h | 0 {modules => modules_k}/misc_radius/misc_radius.c | 0 {modules => modules_k}/misc_radius/misc_radius.h | 0 24 files changed, 0 insertions(+), 0 deletions(-) diff --git a/modules/auth_radius/Makefile b/modules_k/auth_radius/Makefile similarity index 100% rename from modules/auth_radius/Makefile rename to modules_k/auth_radius/Makefile diff --git a/modules/auth_radius/README b/modules_k/auth_radius/README similarity index 100% rename from modules/auth_radius/README rename to modules_k/auth_radius/README diff --git a/modules/auth_radius/authorize.c b/modules_k/auth_radius/authorize.c similarity index 100% rename from modules/auth_radius/authorize.c rename to modules_k/auth_radius/authorize.c diff --git a/modules/auth_radius/authorize.h b/modules_k/auth_radius/authorize.h similarity index 100% rename from modules/auth_radius/authorize.h rename to modules_k/auth_radius/authorize.h diff --git a/modules/auth_radius/authrad_mod.c b/modules_k/auth_radius/authrad_mod.c similarity index 100% rename from modules/auth_radius/authrad_mod.c rename to modules_k/auth_radius/authrad_mod.c diff --git a/modules/auth_radius/authrad_mod.h b/modules_k/auth_radius/authrad_mod.h similarity index 100% rename from modules/auth_radius/authrad_mod.h rename to modules_k/auth_radius/authrad_mod.h diff --git a/modules/auth_radius/doc/Makefile b/modules_k/auth_radius/doc/Makefile similarity index 100% rename from modules/auth_radius/doc/Makefile rename to modules_k/auth_radius/doc/Makefile diff --git a/modules/auth_radius/doc/auth_radius.xml b/modules_k/auth_radius/doc/auth_radius.xml similarity index 100% rename from modules/auth_radius/doc/auth_radius.xml rename to modules_k/auth_radius/doc/auth_radius.xml diff --git a/modules/auth_radius/doc/auth_radius_admin.xml b/modules_k/auth_radius/doc/auth_radius_admin.xml similarity index 100% rename from modules/auth_radius/doc/auth_radius_admin.xml rename to modules_k/auth_radius/doc/auth_radius_admin.xml diff --git a/modules/auth_radius/extra.c b/modules_k/auth_radius/extra.c similarity index 100% rename from modules/auth_radius/extra.c rename to modules_k/auth_radius/extra.c diff --git a/modules/auth_radius/extra.h b/modules_k/auth_radius/extra.h similarity index 100% rename from modules/auth_radius/extra.h rename to modules_k/auth_radius/extra.h diff --git a/modules/auth_radius/sterman.c b/modules_k/auth_radius/sterman.c similarity index 100% rename from modules/auth_radius/sterman.c rename to modules_k/auth_radius/sterman.c diff --git a/modules/auth_radius/sterman.h b/modules_k/auth_radius/sterman.h similarity index 100% rename from modules/auth_radius/sterman.h rename to modules_k/auth_radius/sterman.h diff --git a/modules/misc_radius/Makefile b/modules_k/misc_radius/Makefile similarity index 100% rename from modules/misc_radius/Makefile rename to modules_k/misc_radius/Makefile diff --git a/modules/misc_radius/README b/modules_k/misc_radius/README similarity index 100% rename from modules/misc_radius/README rename to modules_k/misc_radius/README diff --git a/modules/misc_radius/doc/Makefile b/modules_k/misc_radius/doc/Makefile similarity index 100% rename from modules/misc_radius/doc/Makefile rename to modules_k/misc_radius/doc/Makefile diff --git a/modules/misc_radius/doc/misc_radius.xml b/modules_k/misc_radius/doc/misc_radius.xml similarity index 100% rename from modules/misc_radius/doc/misc_radius.xml rename to modules_k/misc_radius/doc/misc_radius.xml diff --git a/modules/misc_radius/doc/misc_radius_admin.xml b/modules_k/misc_radius/doc/misc_radius_admin.xml similarity index 100% rename from modules/misc_radius/doc/misc_radius_admin.xml rename to modules_k/misc_radius/doc/misc_radius_admin.xml diff --git a/modules/misc_radius/extra.c b/modules_k/misc_radius/extra.c similarity index 100% rename from modules/misc_radius/extra.c rename to modules_k/misc_radius/extra.c diff --git a/modules/misc_radius/extra.h b/modules_k/misc_radius/extra.h similarity index 100% rename from modules/misc_radius/extra.h rename to modules_k/misc_radius/extra.h diff --git a/modules/misc_radius/functions.c b/modules_k/misc_radius/functions.c similarity index 100% rename from modules/misc_radius/functions.c rename to modules_k/misc_radius/functions.c diff --git a/modules/misc_radius/functions.h b/modules_k/misc_radius/functions.h similarity index 100% rename from modules/misc_radius/functions.h rename to modules_k/misc_radius/functions.h diff --git a/modules/misc_radius/misc_radius.c b/modules_k/misc_radius/misc_radius.c similarity index 100% rename from modules/misc_radius/misc_radius.c rename to modules_k/misc_radius/misc_radius.c diff --git a/modules/misc_radius/misc_radius.h b/modules_k/misc_radius/misc_radius.h similarity index 100% rename from modules/misc_radius/misc_radius.h rename to modules_k/misc_radius/misc_radius.h

14 years, 5 months

git:master: auth(s): s/auth_api/auth_api_s & s/bind_auth/bind_auth_s

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f93a3d56abd81d81d19a24ed0d1da7e1fe30fde1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f93a3d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 17:13:19 2010 +0200 auth(s): s/auth_api/auth_api_s & s/bind_auth/bind_auth_s Rename auth_api_t and bind_auth (add _s), to avoid possible runtime problems when mixing ser and kamailio auth_api using modules. --- modules_s/auth/api.c | 2 +- modules_s/auth/api.h | 8 ++++---- modules_s/auth/auth_mod.c | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_s/auth/api.c b/modules_s/auth/api.c index f867ab0..084a96a 100644 --- a/modules_s/auth/api.c +++ b/modules_s/auth/api.c @@ -178,7 +178,7 @@ auth_result_t post_auth(struct sip_msg* msg, struct hdr_field* hdr) } -int bind_auth(auth_api_t* api) +int bind_auth_s(auth_api_s_t* api) { if (!api) { LOG(L_ERR, "bind_auth: Invalid parameter value\n"); diff --git a/modules_s/auth/api.h b/modules_s/auth/api.h index 7228ef7..31ee368 100644 --- a/modules_s/auth/api.h +++ b/modules_s/auth/api.h @@ -79,17 +79,17 @@ auth_result_t post_auth(struct sip_msg* msg, struct hdr_field* hdr); /* * Auth module API */ -typedef struct auth_api { +typedef struct auth_api_s { pre_auth_t pre_auth; /* The function to be called before authentication */ post_auth_t post_auth; /* The function to be called after authentication */ build_challenge_hf_t build_challenge; /* Function to build digest challenge header */ struct qp* qop; /* qop module parameter */ calc_HA1_t calc_HA1; calc_response_t calc_response; -} auth_api_t; +} auth_api_s_t; -typedef int (*bind_auth_t)(auth_api_t* api); -int bind_auth(auth_api_t* api); +typedef int (*bind_auth_s_t)(auth_api_s_t* api); +int bind_auth_s(auth_api_s_t* api); #endif /* API_H */ diff --git a/modules_s/auth/auth_mod.c b/modules_s/auth/auth_mod.c index d33cba7..7a3d40a 100644 --- a/modules_s/auth/auth_mod.c +++ b/modules_s/auth/auth_mod.c @@ -108,7 +108,7 @@ struct qp qop = { */ static cmd_export_t cmds[] = { {"consume_credentials", consume_credentials, 0, 0, REQUEST_ROUTE}, - {"bind_auth", (cmd_function)bind_auth, 0, 0, 0 }, + {"bind_auth_s", (cmd_function)bind_auth_s, 0, 0, 0 }, {0, 0, 0, 0, 0} };

14 years, 5 months

git:master: *_radius(s): doc: update to the new doc makefile format

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: a7ddee8e5f9fba13c482e8b1b2ba3a59e5598fea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7ddee8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 17:30:26 2010 +0200 *_radius(s): doc: update to the new doc makefile format Update the doc makefiles for auth_radius, avp_radius and uri_radius. --- modules_s/auth_radius/doc/Makefile | 31 +++---------------------------- modules_s/avp_radius/doc/Makefile | 31 +++---------------------------- modules_s/uri_radius/doc/Makefile | 31 +++---------------------------- 3 files changed, 9 insertions(+), 84 deletions(-) diff --git a/modules_s/auth_radius/doc/Makefile b/modules_s/auth_radius/doc/Makefile index 4537cf4..477c335 100644 --- a/modules_s/auth_radius/doc/Makefile +++ b/modules_s/auth_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = auth_radius +docs = auth_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_s/avp_radius/doc/Makefile b/modules_s/avp_radius/doc/Makefile index 1bd9eb9..dd0cd7c 100644 --- a/modules_s/avp_radius/doc/Makefile +++ b/modules_s/avp_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = avp_radius +docs = avp_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module diff --git a/modules_s/uri_radius/doc/Makefile b/modules_s/uri_radius/doc/Makefile index 27d7ea1..829e048 100644 --- a/modules_s/uri_radius/doc/Makefile +++ b/modules_s/uri_radius/doc/Makefile @@ -1,29 +1,4 @@ -# -# The list of documents to build (without extensions) -# -DOCUMENTS = uri_radius +docs = uri_radius.xml -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) - -include $(ROOT_DIR)/Makefile.doc +docbook_dir=../../../docbook +include $(docbook_dir)/Makefile.module

14 years, 5 months

git:master: auth_radius(s), avp_radius(s), uri_radius(s): revived

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b06131c655bceaaf1edbef75594e109a3b57c1ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b06131c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jun 14 16:32:21 2010 +0200 auth_radius(s), avp_radius(s), uri_radius(s): revived Revive modules_/{auth_radius,avp_radius,uri_radius}. Needed to be able to use radius auth. with ser auth_api/module (the ser and kamailio auth apis are not compatible and so one cannot use a kamailio radius auth with the ser auth module). Reverts 456c3c137e9abcf687413f9675fe0f1761ce820d. --- modules_s/auth_radius/Makefile | 17 ++ modules_s/auth_radius/README | 189 +++++++++++++ modules_s/auth_radius/authorize.c | 302 +++++++++++++++++++++ modules_s/auth_radius/authorize.h | 52 ++++ modules_s/auth_radius/authrad_mod.c | 204 ++++++++++++++ modules_s/auth_radius/authrad_mod.h | 50 ++++ modules_s/auth_radius/doc/Makefile | 29 ++ modules_s/auth_radius/doc/auth_radius.xml | 80 ++++++ modules_s/auth_radius/doc/functions.xml | 110 ++++++++ modules_s/auth_radius/doc/params.xml | 76 ++++++ modules_s/auth_radius/sterman.c | 283 ++++++++++++++++++++ modules_s/auth_radius/sterman.h | 56 ++++ modules_s/avp_radius/Makefile | 18 ++ modules_s/avp_radius/README | 115 ++++++++ modules_s/avp_radius/avp_radius.c | 413 +++++++++++++++++++++++++++++ modules_s/avp_radius/doc/Makefile | 29 ++ modules_s/avp_radius/doc/avp_radius.xml | 53 ++++ modules_s/avp_radius/doc/functions.xml | 53 ++++ modules_s/avp_radius/doc/params.xml | 52 ++++ modules_s/uri_radius/Makefile | 16 ++ modules_s/uri_radius/README | 142 ++++++++++ modules_s/uri_radius/checks.c | 168 ++++++++++++ modules_s/uri_radius/checks.h | 43 +++ modules_s/uri_radius/doc/Makefile | 29 ++ modules_s/uri_radius/doc/functions.xml | 38 +++ modules_s/uri_radius/doc/params.xml | 53 ++++ modules_s/uri_radius/doc/uri_radius.xml | 57 ++++ modules_s/uri_radius/urirad_mod.c | 126 +++++++++ modules_s/uri_radius/urirad_mod.h | 43 +++ 29 files changed, 2896 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b06…

14 years, 5 months

git:master: modules_k/siputils: added is_e164(pv) function

by Juha Heinanen

Module: sip-router Branch: master Commit: 79a959c30f6997cbc904e0a3b860774019f064a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79a959c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Jun 14 15:27:48 2010 +0300 modules_k/siputils: added is_e164(pv) function - More generic version of is_uri_user_e164(pv) that avoids parsing of URI if user is already in a pseudo variable. --- modules_k/siputils/README | 122 +++++++++++++++++------------ modules_k/siputils/checks.c | 28 +++++++ modules_k/siputils/checks.h | 5 + modules_k/siputils/doc/siputils_admin.xml | 29 +++++++ modules_k/siputils/siputils.c | 1 + 5 files changed, 135 insertions(+), 50 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=79a…

14 years, 5 months

git:master: shm_regex lib: locks added around the regular expression

by Miklos Tirpak

Module: sip-router Branch: master Commit: fc28a62a4ef4ff2eaa9e1636a747099284280a23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fc28a62… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jun 14 15:40:20 2010 +0200 shm_regex lib: locks added around the regular expression The libc locks moved to shared memory did not work on multi-cpu machines. Credit goes to Stefan Keller (stefan.keller at isaco.de) for identifying the problem and for the patch. "The code hangs in regexec() when trying to acquire the lock. ... It turns out this only happens if the machine has more than one physical CPU core. Reproducable on x86_64 with two CPU cores, glibc 2.3.6 (from Debian Etch) and glibc 2.11.1 (from Ubuntu Lucid)." --- lib/shm_regex/Makefile | 1 + lib/shm_regex/shm_regex.c | 35 +++++++++++++++++++++++++++-------- lib/shm_regex/shm_regex.h | 18 +++++++++++++----- 3 files changed, 41 insertions(+), 13 deletions(-) diff --git a/lib/shm_regex/Makefile b/lib/shm_regex/Makefile index 2a0c907..4653863 100644 --- a/lib/shm_regex/Makefile +++ b/lib/shm_regex/Makefile @@ -8,6 +8,7 @@ NAME:=ser_shm_regex MAJOR_VER=0 MINOR_VER=1 BUGFIX_VER=0 +INCLUDES= -I$(CURDIR)/../.. LIBS= include ../../Makefile.libs diff --git a/lib/shm_regex/shm_regex.c b/lib/shm_regex/shm_regex.c index 165d535..e28d1c9 100644 --- a/lib/shm_regex/shm_regex.c +++ b/lib/shm_regex/shm_regex.c @@ -27,6 +27,8 @@ * History * ------- * 2009-04-03 Initial version (Miklos) + * 2010-04-25 Use own struct with locking to work-around libc locking failure + * on multi-core hw (skeller) */ #include <malloc.h> /* hook prototypes */ @@ -75,32 +77,37 @@ static void shm_free_hook(void *ptr, const void *caller) __free_hook = orig_free_hook; \ } while (0) -int shm_regcomp(regex_t *preg, const char *regex, int cflags) +int shm_regcomp(shm_regex_t *preg, const char *regex, int cflags) { malloc_hook_t *orig_malloc_hook; realloc_hook_t *orig_realloc_hook; free_hook_t *orig_free_hook; int ret; + if(!lock_init(&preg->lock)) { + return REG_EEND; + } replace_malloc_hooks(); - ret = regcomp(preg, regex, cflags); + ret = regcomp(&preg->regexp, regex, cflags); restore_malloc_hooks(); + if(ret) lock_destroy(&preg->lock); + return ret; } -void shm_regfree(regex_t *preg) +void shm_regfree(shm_regex_t *preg) { malloc_hook_t *orig_malloc_hook; realloc_hook_t *orig_realloc_hook; free_hook_t *orig_free_hook; - + lock_destroy(&preg->lock); replace_malloc_hooks(); - regfree(preg); + regfree(&preg->regexp); restore_malloc_hooks(); } -int shm_regexec(const regex_t *preg, const char *string, size_t nmatch, +int shm_regexec(shm_regex_t *preg, const char *string, size_t nmatch, regmatch_t pmatch[], int eflags) { malloc_hook_t *orig_malloc_hook; @@ -118,12 +125,24 @@ int shm_regexec(const regex_t *preg, const char *string, size_t nmatch, * It is safe to call regexec() concurrently without locking, * because regexec() has its own locks. * (Miklos) + * + * Those locks, however, don't work with shm and multi-core hardware + * causing a dead-lock. Tested with glibc 2.3.6. (skeller) */ + + lock_get(&preg->lock); replace_malloc_hooks(); - ret = regexec(preg, string, nmatch, + ret = regexec(&preg->regexp, string, nmatch, pmatch, eflags); restore_malloc_hooks(); - + lock_release(&preg->lock); + return ret; } +size_t shm_regerror(int errcode, const shm_regex_t *preg, char *errbuf, + size_t errbuf_size) +{ + return regerror(errcode, &preg->regexp, errbuf, errbuf_size); +} + diff --git a/lib/shm_regex/shm_regex.h b/lib/shm_regex/shm_regex.h index 42ec52b..aabf100 100644 --- a/lib/shm_regex/shm_regex.h +++ b/lib/shm_regex/shm_regex.h @@ -27,6 +27,8 @@ * History * ------- * 2009-04-03 Initial version (Miklos) + * 2010-04-25 Use own struct with locking to work-around libc locking failure + * on multi-core hw (skeller) */ #ifndef _SHM_REGEX_H @@ -34,12 +36,18 @@ #include <sys/types.h> #include <regex.h> +#include "locking.h" -int shm_regcomp(regex_t *preg, const char *regex, int cflags); -void shm_regfree(regex_t *preg); -int shm_regexec(const regex_t *preg, const char *string, size_t nmatch, - regmatch_t pmatch[], int eflags); +typedef struct shm_regex { + regex_t regexp; + gen_lock_t lock; +} shm_regex_t; -#define shm_regerror regerror +int shm_regcomp(shm_regex_t *preg, const char *regex, int cflags); +void shm_regfree(shm_regex_t *preg); +int shm_regexec(shm_regex_t *preg, const char *string, size_t nmatch, + regmatch_t pmatch[], int eflags); +size_t shm_regerror(int errcode, const shm_regex_t *preg, char *errbuf, + size_t errbuf_size); #endif /* _SHM_REGEX_H */

14 years, 5 months

shm_regex deadlock

by Stefan Keller

Hi, I used the shm_regex functions from lib in one of my own modules and noticed that it is dead-locking (it hangs in FUTEX_WAIT). The code hangs in regexec() when trying to acquire the lock. This was a bit hard to find out as I couldn't reproduce it in a virtual machine with some test code I wrote. It turns out this only happens if the machine has more than one physical CPU core. Reproducable on x86_64 with two CPU cores, glibc 2.3.6 (from Debian Etch) and glibc 2.11.1 (from Ubuntu Jaunty). Attached is a patch which does its own locking and thus works around this problem. Best regards, Stefan -- M.Eng. Stefan Keller CTO (Technischer Leiter) Phone +49-30-203899889 Mobile +49-170-4150437 Fax +49-30-722399150 stefan.keller(a)isaco.de www.isaco.de ISACO GmbH Kurfürstenstr. 79 10787 Berlin Germany Amtsgericht Charlottenburg, HRB 112464B Geschäftsführer: Daniel Frommherz

14 years, 5 months

auth apis & radius (was: [SR-Users] auth_radius - Segmentation fault)

by Andrei Pelinescu-Onciul

[cc'ed sr-dev] On Jun 13, 2010 at 11:10, Juha Heinanen <jh(a)tutpro.com> wrote: > Dmitry Kirillov writes: > > > Program received signal SIGSEGV, Segmentation fault. > > 0x2880c2c0 in qop () from /usr/local/lib/ser/modules_s/auth.so > > (gdb) bt > > #0 0x2880c2c0 in qop () from /usr/local/lib/ser/modules_s/auth.so > > #1 0x28816555 in authorize (_msg=0x8343b58, _realm=0x0, _uri_user=0x0, > > _hftype=15) at authorize.c:102 > > #2 0x288163e8 in radius_proxy_authorize_1 (_msg=0x8343b58, _realm=0x0, > > _s2=0x0) at authorize.c:157 > > i'm not sure what is going on. looks like you are using s version of > auth module, but there pre_auth has five params: > > auth_result_t pre_auth(struct sip_msg* msg, str* realm, hdr_types_t hftype, > struct hdr_field** hdr, check_auth_hdr_t check_auth_hdr) > > whereas the above seems to indicate that k version of auth module is in > use where pre_auth has four params: > > auth_result_t pre_auth(struct sip_msg* _m, str* _realm, hdr_types_t _hftype, > struct hdr_field** _h) It looks like he uses modules/auth_radius (which seems to be the k version) and modules_s/auth. Unfortunately the ser auth api is incompatible with the k one. OTOH IMHO the ser auth module is superior to the k one, e.g.: ser auth: + nonce-count/qop=auth* support: http://sip-router.org/docbook/sip-router/branch/master/modules_s/auth/auth.… + lockless in nonce-count or one time nonce mode + extra protection even in non qop=auth mode and non-one-time-nonce mode (the one time nonce mode has potential issues with retransmissions): http://sip-router.org/docbook/sip-router/branch/master/modules_s/auth/auth.… + speed optimized (less syscalls, concurrent access) + base64 nonces (shorter) k auth (at first sight) seems to support only on-time-nonces and their implementation uses locks (and seems to be more "limited"). > > anyway, i only have experience with kamailio_3.0 radius auth, which has > worked fine. perhaps you can try with that too. We need either to quickly merge the auth apis or revive modules_s/auth_radius (and probably the other modules_s/*radius). Unfortunately merging the auth api doesn't look like a quick job: ser auth api: + build_challenge() + qop + calc_response() k auth api: + rpid_avp + rpid_avp_type + check_response() so reviving the modules_s/*radius looks like the quick fix (at least for 3.0). So anybody against reviving them in 3.0? (or does anybody remember any problem with the s versions?) Andrei

14 years, 5 months

git:andrei/raw_sock: core: basic support for receiving udp sip packets on raw sockets

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/raw_sock Commit: 861d3a2edc57842e35768d06ea4440e53a6f2f81 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=861d3a2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jun 9 22:55:21 2010 +0200 core: basic support for receiving udp sip packets on raw sockets Functions for receiving udp sip packets from raw sockets. --- raw_listener.c | 147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ raw_listener.h | 39 +++++++++++++++ 2 files changed, 186 insertions(+), 0 deletions(-) diff --git a/raw_listener.c b/raw_listener.c new file mode 100644 index 0000000..ef707a2 --- /dev/null +++ b/raw_listener.c @@ -0,0 +1,147 @@ +/* + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** raw socket udp listen functions. + * @file raw_listener.c + * @ingroup core + * Module: @ref core + */ +/* + * History: + * -------- + * 2010-06-09 intial version (from older code) andrei + */ + +#ifdef USE_RAW_SOCKS + +#include "../../config.h" +#include "../../receive.h" + +#include "raw_listener.h" +#include "raw_sock.h" +#include "tlb_send.h" +#include "tlb_cfg.h" + +#include <errno.h> +#include <string.h> + +struct raw_listen_info* raw_sendipv4=0; + +/** creates a raw socket based on a socket_info structure. + * Side-effects: sets raw_udp_sendipv4 if not already set. + * @param si - pointer to partially filled socket_info structure (su must + * be set). + * @param iface - pointer to network interface to bind on (str). Can be null. + * @param iphdr_incl - 1 if send on these socket will include the IP header. + * @return <0 on error, socket on success. + */ +int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl) +{ + int sock; + struct ip_addr ip; + + su2ip_addr(&ip, &si->su); + sock=raw_udp4_socket(&ip, iface, iphdr_incl); + if (sock>=0){ + if (raw_sendipv4==0 || iface==0 || iface->s==0) + raw_udp_sendipv4=si; + } + return sock; +} + + + +/** receive sip udp ipv4 packets over a raw socket in a loop. + * It should be called by a "raw socket receiver" process + * (since the function never exits unless it encounters a + * critical error). + * @param rsock - initialized raw socket. + * @param port1 - start of port range. + * @param port2 - end of port range. If 0 it's equivalent to listening only + * on port1. + * @return <0 on error, never returns on success. + */ +int raw_udp4_rcv_loop(int rsock, int port1, int port2) +{ + static char buf[BUF_SIZE+1]; + char* p; + char* tmp; + union sockaddr_union from; + union sockaddr_union to; + struct receive_info ri; + struct raw_filter rf; + int len; + + /* this will not change */ + from.sin.sin_family=AF_INET; + ri.bind_address=0; + ri.proto=PROTO_UDP; + ri.proto_reserved1=0; + ri.proto_reserved2=0; + /* set filter to match any address but with the specified port range */ + memset(&rf, 0, sizeof(rf)); + rf.dst.ip.af=AF_INET; + rf.dst.ip.len=4; + rf.dst.mask.af=AF_INET; + rf.dst.mask.len=4; + rf.proto=PROTO_UDP; + rf.port1=port1; + rf.port2=port2?port2:port1; + for(;;){ + p=buf; + len=raw_udp4_recv(rsock, &p, BUF_SIZE, &from, &to, &rf); + if (len<0){ + if (len==-1){ + LOG(L_ERR, "ERROR: raw_udp4_rcv_loop:raw_udp4_recv: %s [%d]\n", + strerror(errno), errno); + if ((errno==EINTR)||(errno==EWOULDBLOCK)) + continue; + else + goto error; + }else{ + DBG("raw_udp4_rcv_loop: raw_udp4_recv error: %d\n", len); + continue; + } + } + /* we must 0-term the message */ + p[len]=0; + ri.src_su=from; + su2ip_addr(&ri.src_ip, &from); + ri.src_port=su_getport(&from); + su2ip_addr(&ri.dst_ip, &to); + ri.dst_port=su_getport(&to); + /* sanity checks */ + if (len<MIN_UDP_PACKET){ + tmp=ip_addr2a(&ri.src_ip); + DBG("raw_udp4_rcv_loop: probing packet received from %s %d\n", + tmp, htons(ri.src_port)); + continue; + } + if (ri.src_port==0){ + tmp=ip_addr2a(&ri.src_ip); + LOG(L_INFO, "raw_udp4_rcv_loop: dropping 0 port packet from %s\n", + tmp); + continue; + } + tmp=ip_addr2a(&ri.src_ip); + DBG("raw_udp4_rcv_loop: received from %s:\n[%.*s]\n", tmp, len, p); + receive_msg(p, len, &ri); + } +error: + return -1; +} + + +#endif /* USE_RAW_SOCKS */ diff --git a/raw_listener.h b/raw_listener.h new file mode 100644 index 0000000..5bc2f58 --- /dev/null +++ b/raw_listener.h @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2010 iptelorg GmbH + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/** raw socket udp listen functions. + * @file raw_listener.h + * @ingroup core + * Module: @ref core + */ +/* + * History: + * -------- + * 2010-06-09 initial version (from older code) andrei + */ + +#ifndef _raw_listener_h +#define _raw_listener_h + +#include "../../ip_addr.h" + + +/** default raw socket used for sending on udp ipv4 */ +struct struct_info* raw_udp_sendipv4; + +int raw_listener_init(struct socket_info* si, str* iface, int iphdr_incl); +int raw_udp4_rcv_loop(int rsock, int port1, int port2); + +#endif /* _raw_listener_h */

14 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2010