sr-dev June 2011

sr-dev@lists.kamailio.org

32 participants
167 discussions

git:master: async: new module for asynchronous config operations

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 58796a4ea5615e4015833d08b979b3cd99b7b5a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=58796a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jun 26 00:43:57 2011 +0200 async: new module for asynchronous config operations - exports async_sleep(seconds) - sleep asynchronously and continue the exection after the seconds interval has passed - it uses t_suspend()/t_continue() - config execution state is lost, so a return at the same level with async_sleep() will exit the config execution --- modules/async/Makefile | 12 +++ modules/async/async_mod.c | 171 +++++++++++++++++++++++++++++++++++++++ modules/async/async_sleep.c | 187 +++++++++++++++++++++++++++++++++++++++++++ modules/async/async_sleep.h | 49 +++++++++++ 4 files changed, 419 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=587…

12 years, 10 months

git:master: core: typedef'ed struct action to cfg_action_t

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c68ba021f6b7924a703129127a58b1289aeafa9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c68ba02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jun 26 11:26:48 2011 +0200 core: typedef'ed struct action to cfg_action_t --- route_struct.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/route_struct.h b/route_struct.h index 985f863..08a576c 100644 --- a/route_struct.h +++ b/route_struct.h @@ -206,6 +206,8 @@ struct action{ action_u_t val[MAX_ACTIONS]; }; +typedef struct action cfg_action_t; + struct expr* mk_exp(int op, struct expr* left, struct expr* right); struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, expr_r_type rtype, void* rparam);

12 years, 10 months

git:master: core: function to return action struct from param

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 486ace87c474881dd371fc98d24c960c1832f96d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=486ace8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jun 25 21:07:31 2011 +0200 core: function to return action struct from param - moved the function from xlog module to core to be used by other modules - get_action_from_param(param, param_no) can return the pointer to action structure when the pointer to pointer param and param no is provided (like in the fixup of module functions) --- route_struct.c | 14 ++++++++++++++ route_struct.h | 2 ++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/route_struct.c b/route_struct.c index 371acaa..d2dee05 100644 --- a/route_struct.c +++ b/route_struct.c @@ -596,3 +596,17 @@ void print_actions(struct action* a) a = a->next; } } + +/** + * get the pointer to action structure from parameter + */ +struct action *get_action_from_param(void **param, int param_no) +{ + struct action *ac, ac2; + action_u_t *au, au2; + /* param points to au->u.string, get pointer to au */ + au = (void*) ((char *)param - ((char *)&au2.u.string-(char *)&au2)); + au = au - 1 - param_no; + ac = (void*) ((char *)au - ((char *)&ac2.val-(char *)&ac2)); + return ac; +} diff --git a/route_struct.h b/route_struct.h index ea46a22..985f863 100644 --- a/route_struct.h +++ b/route_struct.h @@ -223,5 +223,7 @@ void print_expr(struct expr* exp); /** joins to cfg file positions into a new one. */ void cfg_pos_join(struct cfg_pos* res, struct cfg_pos* pos1, struct cfg_pos* pos2); + +struct action *get_action_from_param(void **param, int param_no); #endif

12 years, 10 months

async processing: t_suspend and t_continue

by Matthew Williams

Hi, We are working on a module in which we plan to utilize the t_suspend/t_continue functions of the tm module. t_suspend is straightforward and is working as expected, it seems. The last parameter of t_continue is of type 'struct action', which I can see is defined in route_struct.h as: struct action{ int cline; char *cfile; enum action_type type; /* forward, drop, log, send ...*/ int count; struct action* next; action_u_t val[MAX_ACTIONS]; }; Does anyone have any practical advice on how to create an action to be used in t_continue? Also... when t_continue is called, does it continue processing in the process that calls t_continue, or is execution handed off to another process? Thank you! Matthew Williams FlowRoute

12 years, 10 months

[ openser-Feature Requests-3330857 ] ZekiozYhzL

by SourceForge.net

Feature Requests item #3330857, was opened at 2011-06-25 13:07 Message generated for change (Tracker Item Submitted) made by nobody You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3330857&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: None Status: Open Resolution: None Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: ZekiozYhzL Initial Comment: FHCaW6 <a href="http://hsxmjfbyeoic.com/">hsxmjfbyeoic</a>, [url=http://nikqzmywvetk.com/]nikqzmywvetk[/url], [link=http://idxkgclxdgwc.com/]idxkgclxdgwc[/link], http://pbhlzbeeqcyc.com/ ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743023&aid=3330857&group_…

12 years, 10 months

git:master: auth_db(k): documented version_table parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 24ba6c21ef86a9f4a2b82ff9f8c2853d9b84bdc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=24ba6c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 24 20:47:21 2011 +0200 auth_db(k): documented version_table parameter --- modules_k/auth_db/README | 64 +++++++++++++++++++----------- modules_k/auth_db/doc/auth_db_admin.xml | 20 ++++++++++ 2 files changed, 60 insertions(+), 24 deletions(-) diff --git a/modules_k/auth_db/README b/modules_k/auth_db/README index df612bc..bc43604 100644 --- a/modules_k/auth_db/README +++ b/modules_k/auth_db/README @@ -24,9 +24,9 @@ Jan Janak <jan(a)iptel.org> - Copyright © 2002, 2003 FhG FOKUS + Copyright � 2002, 2003 FhG FOKUS - Copyright © 2005 Voice Sistem SRL + Copyright � 2005 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -49,6 +49,7 @@ Jan Janak 3.6. calculate_ha1 (integer) 3.7. use_domain (integer) 3.8. load_credentials (string) + 3.9. version_table (integer) 4. Exported Functions @@ -67,8 +68,9 @@ Jan Janak 1.6. calculate_ha1 parameter usage 1.7. use_domain parameter usage 1.8. load_credentials parameter usage - 1.9. www_authorize usage - 1.10. proxy_authorize usage + 1.9. version_table parameter usage + 1.10. www_authorize usage + 1.11. proxy_authorize usage Chapter 1. Admin Guide @@ -90,6 +92,7 @@ Chapter 1. Admin Guide 3.6. calculate_ha1 (integer) 3.7. use_domain (integer) 3.8. load_credentials (string) + 3.9. version_table (integer) 4. Exported Functions @@ -135,6 +138,7 @@ Chapter 1. Admin Guide 3.6. calculate_ha1 (integer) 3.7. use_domain (integer) 3.8. load_credentials (string) + 3.9. version_table (integer) 3.1. db_url (string) @@ -144,7 +148,7 @@ Chapter 1. Admin Guide For dbtext module (which stores data in plaintext files) it is directory in which the database resides. - Default value is “mysql://openserro:openserro@localhost/openser”. + Default value is "mysql://openserro:openserro@localhost/openser". Example 1.1. db_url parameter usage ... @@ -156,7 +160,7 @@ modparam("auth_db", "db_url", "dbdriver://username:password@dbhost/dbname") This is the name of the column holding usernames. Default value is fine for most people. Use the parameter if you really need to change it. - Default value is “username”. + Default value is "username". Example 1.2. user_column parameter usage ... @@ -169,7 +173,7 @@ modparam("auth_db", "user_column", "user") is fine for most people. Use the parameter if you really need to change it. - Default value is “domain”. + Default value is "domain". Example 1.3. domain_column parameter usage ... @@ -184,7 +188,7 @@ modparam("auth_db", "domain_column", "domain") safe because the server doesn't need to know plaintext passwords and they cannot be obtained from HA1 strings. - Default value is “ha1”. + Default value is "ha1". Example 1.4. password_column parameter usage ... @@ -212,16 +216,16 @@ modparam("auth_db", "password_column_2", "ha1_2") HA1 string or plaintext passwords for authentification. If the parameter is set to 0 and the username parameter of credentials - contains also “@domain” (some user agents append the domain to the + contains also "@domain" (some user agents append the domain to the username parameter), then the server will use the HA1 values from the - column specified in the “password_column_2” parameter. If the username + column specified in the "password_column_2" parameter. If the username parameter doesn't contain a domain, the server will use the HA1 values - from the column given in the “password_column”parameter. + from the column given in the "password_column"parameter. If the parameter is set to 1 then the HA1 value will be calculated from - the column specified in the “password_column” parameter. + the column specified in the "password_column" parameter. - The “password_column_2”column contain also HA1 strings but they should + The "password_column_2"column contain also HA1 strings but they should be calculated including the domain in the username parameter (as opposed to password_column which (when containing HA1 strings) should always contains HA1 strings calculated without domain in username. @@ -247,7 +251,7 @@ modparam("auth_db", "calculate_ha1", 1) IMPORTANT: before turning on this parameter, be sure that the domain column in subscriber table is properly populated. - Default value is “0 (false)”. + Default value is "0 (false)". Example 1.7. use_domain parameter usage ... @@ -266,7 +270,7 @@ modparam("auth_db", "use_domain", 1) * credential = (avp_specification '=' column_name) | (column_name) * avp_specification = '$avp(' + 'i:'ID | 's:'NAME | alias + ')' - Default value of this parameter is “rpid”. + Default value of this parameter is "rpid". Example 1.8. load_credentials parameter usage ... @@ -275,6 +279,18 @@ modparam("auth_db", "use_domain", 1) modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") ... +3.9. version_table (integer) + + If set to 0, the module will skip checking the version for subscriber + table. + + Default value is "1 (check for table version)". + + Example 1.9. version_table parameter usage +... +modparam("auth_db", "version_table", 0) +... + 4. Exported Functions 4.1. www_authenticate(realm, table) @@ -282,7 +298,7 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") 4.3. proxy_authenticate(realm, table) 4.4. proxy_authorize(realm, table) -4.1. www_authenticate(realm, table) +4.1. www_authenticate(realm, table) Name alias: www_authorize(realm, table) @@ -303,7 +319,7 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string “”. In case of REGISTER requests To + It must not be empty string "". In case of REGISTER requests To header field domain (e.g., variable $td) can be used (because this header field represents the user being registered), for all other messages From header field domain can be used (e.g., variable $fd). @@ -313,20 +329,20 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") This function can be used from REQUEST_ROUTE. - Example 1.9. www_authorize usage + Example 1.10. www_authorize usage ... if (www_authorize("kamailio.org", "subscriber")) { www_challenge("kamailio.org", "1"); }; ... -4.2. www_authorize(realm, table) +4.2. www_authorize(realm, table) It is same function as www_authenticate(realm, table). This name is kept for backward compatibility, since it was named this way first time by it actually does user authentication. -4.3. proxy_authenticate(realm, table) +4.3. proxy_authenticate(realm, table) Name alias: proxy_authorize(realm, table) @@ -343,9 +359,9 @@ if (www_authorize("kamailio.org", "subscriber")) { * realm - Realm is a opaque string that the user agent should present to the user so he can decide what username and password to use. Usually this is domain of the host the server is running on. - It must not be empty string “”. Apart of a static strinh, typical + It must not be empty string "". Apart of a static strinh, typical value is From header field domain (e.g., variable $fd). - If an empty string “” is used then the server will generate it from + If an empty string "" is used then the server will generate it from the request. From header field domain will be used as realm. The string may contain pseudo variables. * table - Table to be used to lookup usernames and passwords (usually @@ -353,14 +369,14 @@ if (www_authorize("kamailio.org", "subscriber")) { This function can be used from REQUEST_ROUTE. - Example 1.10. proxy_authorize usage + Example 1.11. proxy_authorize usage ... if (!proxy_authorize("$fd", "subscriber)) { proxy_challenge("$fd", "1"); # Realm will be autogenerated }; ... -4.4. proxy_authorize(realm, table) +4.4. proxy_authorize(realm, table) It is same function as proxy_authenticate(realm, table). This name is kept for backward compatibility, since it was named this way first time diff --git a/modules_k/auth_db/doc/auth_db_admin.xml b/modules_k/auth_db/doc/auth_db_admin.xml index f00e5ca..9bfe61d 100644 --- a/modules_k/auth_db/doc/auth_db_admin.xml +++ b/modules_k/auth_db/doc/auth_db_admin.xml @@ -279,6 +279,26 @@ modparam("auth_db", "load_credentials", "$avp(i:123)=rpid;email_address") </programlisting> </example> </section> + + <section> + <title><varname>version_table</varname> (integer)</title> + <para> + If set to 0, the module will skip checking the version + for subscriber table. + </para> + <para> + Default value is <quote>1 (check for table version)</quote>. + </para> + <example> + <title><varname>version_table</varname> parameter usage</title> + <programlisting format="linespecific"> +... +modparam("auth_db", "version_table", 0) +... + </programlisting> + </example> + </section> + </section> <section>

12 years, 10 months

git:master: auth_db: option to skip checking version table

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1a25853ea728711937794402a4aaa556fa69be73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a25853… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 24 20:46:11 2011 +0200 auth_db: option to skip checking version table - new parameter 'version_table' to be able to disable checking for version table - useful when connecting to a different database to fetch the password --- modules_k/auth_db/authdb_mod.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules_k/auth_db/authdb_mod.c b/modules_k/auth_db/authdb_mod.c index ba78ef3..e74fff0 100644 --- a/modules_k/auth_db/authdb_mod.c +++ b/modules_k/auth_db/authdb_mod.c @@ -93,6 +93,7 @@ str domain_column = {DOMAIN_COL, DOMAIN_COL_LEN}; str pass_column = {PASS_COL, PASS_COL_LEN}; str pass_column_2 = {PASS_COL_2, PASS_COL_2_LEN}; +static int version_table_check = 1; int calc_ha1 = 0; int use_domain = 0; /* Use also domain when looking up in table */ @@ -127,14 +128,15 @@ static cmd_export_t cmds[] = { * Exported parameters */ static param_export_t params[] = { - {"db_url", STR_PARAM, &db_url.s }, - {"user_column", STR_PARAM, &user_column.s }, - {"domain_column", STR_PARAM, &domain_column.s }, - {"password_column", STR_PARAM, &pass_column.s }, - {"password_column_2", STR_PARAM, &pass_column_2.s }, - {"calculate_ha1", INT_PARAM, &calc_ha1 }, - {"use_domain", INT_PARAM, &use_domain }, - {"load_credentials", STR_PARAM, &credentials_list }, + {"db_url", STR_PARAM, &db_url.s }, + {"user_column", STR_PARAM, &user_column.s }, + {"domain_column", STR_PARAM, &domain_column.s }, + {"password_column", STR_PARAM, &pass_column.s }, + {"password_column_2", STR_PARAM, &pass_column_2.s }, + {"calculate_ha1", INT_PARAM, &calc_ha1 }, + {"use_domain", INT_PARAM, &use_domain }, + {"load_credentials", STR_PARAM, &credentials_list }, + {"version_table", INT_PARAM, &version_table_check }, {0, 0, 0} }; @@ -250,7 +252,9 @@ static int auth_fixup(void** param, int param_no) LM_ERR("unable to open database connection\n"); return -1; } - if(db_check_table_version(&auth_dbf, dbh, &name, TABLE_VERSION) < 0) { + if(version_table_check!=0 + && db_check_table_version(&auth_dbf, dbh, &name, + TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); auth_dbf.close(dbh); return -1;

12 years, 10 months

git:master: cfg framework: functions to iterate though the group instances

by Miklos Tirpak

Module: sip-router Branch: master Commit: 62ed44d1cf6f5f2c824604bcafe54619c298ceaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=62ed44d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jun 3 13:38:32 2011 +0200 cfg framework: functions to iterate though the group instances Two functions, cfg_select_first and cfg_select_next, are added which can be used to iterate though the instances of a cfg group. --- cfg/cfg_struct.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ cfg/cfg_struct.h | 21 +++++++++++++++++ 2 files changed, 86 insertions(+), 0 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 4e247cd..6e93ca0 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -1169,3 +1169,68 @@ int cfg_reset(cfg_group_t *group) group->name_len, group->name); return 0; } + +/* Move the group handle to the first group instance. + * This function together with cfg_select_next() can be used + * to iterate though the list of instances. + * + * Return value: + * -1: no group instance found + * 0: first group instance is successfully selected. + */ +int cfg_select_first(cfg_group_t *group) +{ + cfg_group_meta_t *meta; + cfg_group_inst_t *ginst; + + meta = CFG_GROUP_META(cfg_local, group); + if (!meta || (meta->num == 0)) + return -1; + + ginst = (cfg_group_inst_t *)meta->array; + cfg_move_handle(group, + CFG_HANDLE_TO_GINST(*(group->handle)), /* the active group instance */ + ginst); + + LOG(L_DBG, "DEBUG: cfg_select_first(): group instance '%.*s[%u]' has been selected\n", + group->name_len, group->name, ginst->id); + return 0; +} + +/* Move the group handle to the next group instance. + * This function together with cfg_select_first() can be used + * to iterate though the list of instances. + * + * Return value: + * -1: no more group instance found. Note, that the active group + * instance is not changed in this case. + * 0: the next group instance is successfully selected. + */ +int cfg_select_next(cfg_group_t *group) +{ + cfg_group_meta_t *meta; + cfg_group_inst_t *old_ginst, *new_ginst; + int size; + + if (!(meta = CFG_GROUP_META(cfg_local, group))) + return -1; + + if (!(old_ginst = CFG_HANDLE_TO_GINST(*(group->handle)) /* the active group instance */)) { + LOG(L_ERR, "ERROR: cfg_select_next(): No group instance is set currently. Forgot to call cfg_select_first()?\n"); + return -1; + } + + size = sizeof(cfg_group_inst_t) + group->size - 1; + if (((char *)old_ginst - (char *)meta->array)/size + 1 >= meta->num) + return -1; /* this is the last group instance */ + + new_ginst = (cfg_group_inst_t *)((char *)old_ginst + size); + cfg_move_handle(group, + old_ginst, /* the active group instance */ + new_ginst); + + LOG(L_DBG, "DEBUG: cfg_select_next(): group instance '%.*s[%u]' has been selected\n", + group->name_len, group->name, new_ginst->id); + return 0; +} + diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index f835a7e..2e91691 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -513,4 +513,25 @@ int cfg_select(cfg_group_t *group, unsigned int id); /* Reset the group handle to the default, local configuration */ int cfg_reset(cfg_group_t *group); +/* Move the group handle to the first group instance. + * This function together with cfg_select_next() can be used + * to iterate though the list of instances. + * + * Return value: + * -1: no group instance found + * 0: first group instance is successfully selected. + */ +int cfg_select_first(cfg_group_t *group); + +/* Move the group handle to the next group instance. + * This function together with cfg_select_first() can be used + * to iterate though the list of instances. + * + * Return value: + * -1: no more group instance found. Note, that the active group + * instance is not changed in this case. + * 0: the next group instance is successfully selected. + */ +int cfg_select_next(cfg_group_t *group); + #endif /* _CFG_STRUCT_H */

12 years, 10 months

git:master: cfg framework: set the handle before creating the cfg group

by Miklos Tirpak

Module: sip-router Branch: master Commit: 78ccd1bb98b1329f0ee9d5acaaa5242ef4d797bc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78ccd1b… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jun 24 15:10:51 2011 +0200 cfg framework: set the handle before creating the cfg group The handle must be set before the config group is created because the related functions save the value for future use. The tcp and sctp config handles are not initialized to the default config struction. This cased a crash because orig_handle was set to the initial value which is uninitialized. --- cfg/cfg.c | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/cfg/cfg.c b/cfg/cfg.c index 2d0f640..0c4d404 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -141,6 +141,14 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, goto error; } + /* The cfg variables are ready to use, let us set the handle + before passing the new definitions to the drivers. + We make the interface usable for the fixup functions + at this step + cfg_set_group() and cfg_new_group() need the handle to be set because + they save its original value. */ + *handle = values; + group_name_len = strlen(group_name); /* check for duplicates */ if ((group = cfg_lookup_group(group_name, group_name_len))) { @@ -162,12 +170,6 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, } group->dynamic = CFG_GROUP_STATIC; - /* The cfg variables are ready to use, let us set the handle - before passing the new definitions to the drivers. - We make the interface usable for the fixup functions - at this step */ - *handle = values; - /* notify the drivers about the new config definition */ cfg_notify_drivers(group_name, group_name_len, def);

12 years, 10 months

git:master: cfg framework: safety checks added

by Miklos Tirpak

Module: sip-router Branch: master Commit: 2ebc2cac489596f6b19bc1cebf25b57b1b69331c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ebc2ca… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Fri Jun 3 14:37:03 2011 +0200 cfg framework: safety checks added Verify that the child process has a local configuration in the functions that work with config group instances. --- cfg/cfg_struct.c | 60 ++++++++++++++++++++++++++++++++++++----------------- 1 files changed, 41 insertions(+), 19 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 6e93ca0..c10dd55 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -1100,26 +1100,28 @@ void cfg_move_handle(cfg_group_t *group, cfg_group_inst_t *src_ginst, cfg_group_ dst_ginst->vars : CFG_GROUP_DATA(cfg_local, group); - /* call the per child process callback of those variables - that have different value in the two group instances */ - /* TODO: performance optimization: this entire loop can be - skipped if the group does not have any variable with - per-child process callback. Use some flag in the group - structure for this purpose. */ - gname.s = group->name; - gname.len = group->name_len; - for (i = 0; i < CFG_MAX_VAR_NUM/(sizeof(int)*8); i++) { - bitmap = ((src_ginst) ? src_ginst->set[i] : 0U) - | ((dst_ginst) ? dst_ginst->set[i] : 0U); - while (bitmap) { - pos = bit_scan_forward32(bitmap); - var = &group->mapping[pos + i*sizeof(int)*8]; - if (var->def->on_set_child_cb) { - vname.s = var->def->name; - vname.len = var->name_len; - var->def->on_set_child_cb(&gname, &vname); + if (cfg_child_cb != CFG_NO_CHILD_CBS) { + /* call the per child process callback of those variables + that have different value in the two group instances */ + /* TODO: performance optimization: this entire loop can be + skipped if the group does not have any variable with + per-child process callback. Use some flag in the group + structure for this purpose. */ + gname.s = group->name; + gname.len = group->name_len; + for (i = 0; i < CFG_MAX_VAR_NUM/(sizeof(int)*8); i++) { + bitmap = ((src_ginst) ? src_ginst->set[i] : 0U) + | ((dst_ginst) ? dst_ginst->set[i] : 0U); + while (bitmap) { + pos = bit_scan_forward32(bitmap); + var = &group->mapping[pos + i*sizeof(int)*8]; + if (var->def->on_set_child_cb) { + vname.s = var->def->name; + vname.len = var->name_len; + var->def->on_set_child_cb(&gname, &vname); + } + bitmap -= (1U << pos); } - bitmap -= (1U << pos); } } /* keep track of how many group instences are set in the child process */ @@ -1140,6 +1142,11 @@ int cfg_select(cfg_group_t *group, unsigned int id) { cfg_group_inst_t *ginst; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + if (!(ginst = cfg_find_group(CFG_GROUP_META(cfg_local, group), group->size, id)) @@ -1161,6 +1168,11 @@ int cfg_select(cfg_group_t *group, unsigned int id) /* Reset the group handle to the default, local configuration */ int cfg_reset(cfg_group_t *group) { + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + cfg_move_handle(group, CFG_HANDLE_TO_GINST(*(group->handle)), /* the active group instance */ NULL); @@ -1183,6 +1195,11 @@ int cfg_select_first(cfg_group_t *group) cfg_group_meta_t *meta; cfg_group_inst_t *ginst; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + meta = CFG_GROUP_META(cfg_local, group); if (!meta || (meta->num == 0)) return -1; @@ -1212,6 +1229,11 @@ int cfg_select_next(cfg_group_t *group) cfg_group_inst_t *old_ginst, *new_ginst; int size; + if (!cfg_local) { + LOG(L_ERR, "ERROR: The child process has no local configuration\n"); + return -1; + } + if (!(meta = CFG_GROUP_META(cfg_local, group))) return -1;

12 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2011