sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

CVS:commitlog: sip_router/cfg cfg_script.c cfg_struct.c

by Miklos Tirpak

tirpi 2009/07/13 17:13:12 CEST SER CVS Repository Modified files: cfg cfg_script.c cfg_struct.c Log: cfg framework: fix the group handles in the main process (backport from GIT) The main process does not have a local configuration, it has access only to the config values that were set before forking. As a result, the group handles cannot ponint to the shared memory address because the shared memory block may be freed later by one of the child processes. This problem resulted sometimes in a core dump after the processes were killed when the main process tried to access a variable from shared mem which was no longer available. Revision Changes Path 1.7 +1 -2 sip_router/cfg/cfg_script.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg/cfg_script.c.d… 1.13 +8 -6 sip_router/cfg/cfg_struct.c http://cvs.berlios.de/cgi-bin/viewcvs.cgi/ser/sip_router/cfg/cfg_struct.c.d…

15 years, 6 months

git:master: cfg framework: readme correction

by Miklos Tirpak

Module: sip-router Branch: master Commit: f38774811308f3e33984fd1e7d1375f00202572f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f387748… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jul 13 16:58:22 2009 +0200 cfg framework: readme correction Documentation about how to read "foreign" config values is corrected. --- doc/cfg.txt | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/doc/cfg.txt b/doc/cfg.txt index 93d2c77..548ef5d 100644 --- a/doc/cfg.txt +++ b/doc/cfg.txt @@ -169,13 +169,15 @@ cfg_get(foo, cfg_handle, p) It is also possible to access the variables of other modules or the core in two different ways: -1) Include the header file of the other module/core that declares the cfg_group_* -structure and the handle for it. Than use the handle of that module/core to access +1) For the core: include the header file that declares the cfg_group_* +structure and the handle for it. Than use the handle of the core to access the variable: -cfg_get(bar, cfg_handle_of_bar, j); +#include "../../cfg_core.h" +cfg_get(core, core_cfg, use_dst_blacklist) -2) Access the variables by their group and variable name: +2) For the core, module, or script: access the variables by their group +and variable name: #include "../../cfg/cfg_select.h" @@ -195,15 +197,15 @@ static int mod_init(void) } int j; -if ((cfg_read_var_int(&var_bar_j, &j)) < 0) { error... } +if ((read_cfg_var_int(&var_bar_j, &j)) < 0) { error... } or similarly, str s; -if ((cfg_read_var_str(&var_bar_j, &s)) < 0) { error... } +if ((read_cfg_var_str(&var_bar_j, &s)) < 0) { error... } 2) is a bit slower than 1) because the first solution returns the pointer directly -to the variable, but 2) supports also the variables declared in the script that are -not known at compile time. +to the variable, but 2) offers access also to the configuration of other modules +and to the variables declared in the script that are not known at compile time. 3. Using the framework in the core ===============================================================================

15 years, 6 months

git:master: cfg framework: fix the group handles in the main process

by Miklos Tirpak

Module: sip-router Branch: master Commit: df8b1cf011e0ecf4c9f06578ddc6b991fd1444c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=df8b1cf… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Mon Jul 13 16:36:36 2009 +0200 cfg framework: fix the group handles in the main process The main process does not have a local configuration, it has access only to the config values that were set before forking. As a result, the group handles cannot ponint to the shared memory address because the shared memory block may be freed later by one of the child processes. This problem resulted sometimes in a core dump after the processes were killed when the main process tried to access a variable from shared mem which was no longer available. --- cfg/cfg_script.c | 1 - cfg/cfg_select.c | 9 +++++++++ cfg/cfg_struct.c | 12 +++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cfg/cfg_script.c b/cfg/cfg_script.c index 39a4068..8804e40 100644 --- a/cfg/cfg_script.c +++ b/cfg/cfg_script.c @@ -143,7 +143,6 @@ error: /* fix-up the dynamically declared group: * - allocate memory for the arrays * - set the values within the memory block - * - notify the drivers about the new group */ int cfg_script_fixup(cfg_group_t *group, unsigned char *block) { diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index 4374aa6..d8871ba 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -203,6 +203,10 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; + if (p == NULL) + return -1; /* The group is not yet ready. + * (Trying to read the value from the + * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: @@ -295,9 +299,14 @@ unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val) group = (cfg_group_t *)(read_handle->group); var = (cfg_mapping_t *)(read_handle->var); + /* use the module's handle to access the variable, so the variables are read from the local config */ p = *(group->handle) + var->offset; + if (p == NULL) + return 0; /* The group is not yet ready. + * (Trying to read the value from the + * main process that has no local configuration) */ switch (CFG_VAR_TYPE(var)) { case CFG_VAR_INT: diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index 533228b..4f28dfe 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -194,21 +194,23 @@ int cfg_shmize(void) /* clone the strings to shm mem */ if (cfg_shmize_strings(group)) goto error; - /* copy the values to the new block, - and update the module's handle */ + /* copy the values to the new block */ memcpy(block->vars+group->offset, group->vars, group->size); - *(group->handle) = block->vars+group->offset; } else { /* The group was declared with NULL values, * we have to fix it up. * The fixup function takes care about the values, * it fills up the block */ if (cfg_script_fixup(group, block->vars+group->offset)) goto error; - *(group->handle) = block->vars+group->offset; - /* notify the drivers about the new config definition */ + /* Notify the drivers about the new config definition. + * Temporary set the group handle so that the drivers have a chance to + * overwrite the default values. The handle must be reset after this + * because the main process does not have a local configuration. */ + *(group->handle) = block->vars+group->offset; cfg_notify_drivers(group->name, group->name_len, group->mapping->def); + *(group->handle) = NULL; } } /* try to fixup the selects that failed to be fixed-up previously */

15 years, 6 months

What is test.c.bak?

by Klaus Darilion

This file is in git-root directory. Maybe some garbage? This file gets deleted during "make deb" - why is "make deb" deleting this file? regards klaus

15 years, 6 months

git:master: core: deleted test.c.bak

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e12cf4810aa16da679bdad77359d7a29ed4225eb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e12cf48… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 13 15:29:55 2009 +0200 core: deleted test.c.bak test.c.bak was one of the first files in the ser repository. test.c was used to test the first version of the sip parser and test.c.bak made it by mistake into the first cvs repository. --- test.c.bak | 134 ------------------------------------------------------------ 1 files changed, 0 insertions(+), 134 deletions(-) diff --git a/test.c.bak b/test.c.bak deleted file mode 100644 index d395060..0000000 --- a/test.c.bak +++ /dev/null @@ -1,134 +0,0 @@ -/* - * tst - */ - -#include <stdio.h> -#include <string.h> - -#include "msg_parser.h" -#include "dprint.h" - -#define BSIZE 1024 -char buf[BSIZE+1]; - -void main() -{ - char* rest; - char* tmp; - char* first_via; - char* second_via; - struct msg_start fl; - struct hdr_field hf; - struct via_body vb1, vb2; - - int len; - int offset; - int r; - - while(!feof(stdin)){ - len=fread(buf,1,BSIZE,stdin); - buf[len+1]=0; - printf("read <%s>(%d)\n",buf,strlen(buf)); - fflush(stdin); - - /* eat crlf from the beginning */ - for (tmp=buf; (*tmp=='\n' || *tmp=='\r')&& - tmp-buf < len ; tmp++); - offset=tmp-buf; - rest=parse_first_line(tmp, len-offset, &fl); - offset+=rest-tmp; - tmp=rest; - switch(fl.type){ - case SIP_INVALID: - printf("invalid message\n"); - break; - case SIP_REQUEST: - printf("SIP Request:\n"); - printf(" method: <%s>\n",fl.u.request.method); - printf(" uri: <%s>\n",fl.u.request.uri); - printf(" version: <%s>\n",fl.u.request.version); - break; - case SIP_REPLY: - printf("SIP Reply (status):\n"); - printf(" version: <%s>\n",fl.u.reply.version); - printf(" status: <%s>\n",fl.u.reply.status); - printf(" reason: <%s>\n",fl.u.reply.reason); - break; - default: - printf("unknown type %d\n",fl.type); - } - - /*find first Via: */ - hf.type=HDR_ERROR; - first_via=0; - second_via=0; - do{ - rest=get_hdr_field(tmp, len-offset, &hf); - offset+=rest-tmp; - tmp=rest; - switch (hf.type){ - case HDR_ERROR: - DPrint("ERROR: bad header field\n"); - goto error; - case HDR_EOH: - goto eoh; - case HDR_VIA: - if (first_via==0) first_via=hf.body; - else if (second_via==0) second_via=hf.body; - break; - } - printf("header field type %d, name=<%s>, body=<%s>\n", - hf.type, hf.name, hf.body); - - - }while(hf.type!=HDR_EOH && rest-buf < len); - - eoh: - /* replace cr/lf with space in first via */ - for (tmp=first_via;(first_via) && (*tmp);tmp++) - if ((*tmp=='\r')||(*tmp=='\n')) *tmp=' '; - - printf("first via: <%s>\n", first_via); - tmp=parse_via_body(first_via, strlen(first_via), &vb1); - if (vb1.error!=VIA_PARSE_OK){ - DPrint("ERROR: parsing via body: %s\n", first_via); - goto error; - } - /* compact via */ - if (vb1.next) second_via=vb1.next; - if (second_via) { - tmp=parse_via_body(second_via, strlen(second_via), &vb2); - if (vb2.error!=VIA_PARSE_OK){ - DPrint("ERROR: parsing via body: %s\n", second_via); - goto error; - } - } - - /* dump parsed data */ - printf(" first via: <%s/%s/%s> <%s:%d>", - vb1.name, vb1.version, vb1.transport, vb1.host, vb1.port); - if (vb1.params) printf(";<%s>", vb1.params); - if (vb1.comment) printf(" <%s>", vb1.comment); - printf ("\n"); - if (second_via){ - printf(" second via: <%s/%s/%s> <%s:%d>", - vb2.name, vb2.version, vb2.transport, vb2.host, vb2.port); - if (vb2.params) printf(";<%s>", vb2.params); - if (vb2.comment) printf(" <%s>", vb2.comment); - printf ("\n"); - } - - - - error: - /* find endof msg */ - printf("rest:(buffer=%x, rest=%x)\n%s\n.\n",buf,rest,rest); - - for (r=0; r<len+1;r++) - printf("%02x ", buf[r]); - printf("\n*rest=%02x\n",*rest); - - } -} - -

15 years, 6 months

git:master: seas: use TMCB_DESTROY tm callback

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e10380691300bcf5c88d1393d3b05f32657525a0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e103806… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 13 15:26:30 2009 +0200 seas: use TMCB_DESTROY tm callback --- modules_k/seas/seas_action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/seas/seas_action.c b/modules_k/seas/seas_action.c index 04fcc46..15e4030 100644 --- a/modules_k/seas/seas_action.c +++ b/modules_k/seas/seas_action.c @@ -1426,7 +1426,7 @@ void uac_cb(struct cell* t, int type,struct tmcb_params *rcvd_params) } if(type == TMCB_LOCAL_COMPLETED && !ev_info->destroy_cb_set) { - if(seas_f.tmb.register_tmcb(NULL, t, TMCB_TRANS_DELETED, uac_cleanup_cb, (void*)ev_info, NULL) <= 0) { + if(seas_f.tmb.register_tmcb(NULL, t, TMCB_DESTROY, uac_cleanup_cb, (void*)ev_info, NULL) <= 0) { LM_ERR( "register_tmcb for destroy callback failed\n"); goto error; }

15 years, 6 months

[tracker] Task opened: modules_s/domain should export is_local API function

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Anonymous user () Attached to Project - sip-router Summary - modules_s/domain should export is_local API function Task Type - Feature Request Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - In order to replace k domain module with more powerful s domain module, the latter should export is_local API function. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=9 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

15 years, 6 months

SF.net SVN: openser:[5899] branches/1.5/timer.c

by Carsten Bock

Revision: 5899 http://openser.svn.sourceforge.net/openser/?rev=5899&view=rev Author: carstenbock Date: 2009-07-13 12:40:31 +0000 (Mon, 13 Jul 2009) Log Message: ----------- Fix double increase of jiffy-value. - As noticed by Daniel. Modified Paths: -------------- branches/1.5/timer.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: debian: fix rules file

by Klaus Darilion

Module: sip-router Branch: master Commit: 462acb9bf0864bbb18f1a0683869cce8e35aafe0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=462acb9… Author: darilion <darilion(a)flunder.lan> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Mon Jul 13 13:36:53 2009 +0200 debian: fix rules file - fix postgress typo - remove non-existing modules - fix list of broken modules, and activate it, so that beta-users can make debian packages without errors --- pkg/debian/rules | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/debian/rules b/pkg/debian/rules index 999ce8e..289ec3e 100755 --- a/pkg/debian/rules +++ b/pkg/debian/rules @@ -36,13 +36,13 @@ export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip" # modules not in the "main" ser package -EXCLUDED_MODULES= jabber xmlrpc postgres cpl cpl-c +EXCLUDED_MODULES=jabber xmlrpc cpl-c # extra modules to skip, because they are not compilable now # - regardless if they go to the main ser package or to some module package, # they will be excluded from compile and install of all -#EXTRA_EXCLUDED_MODULES= cpl-c avpops flatstore pdt lcr msilo bdb dbtext iptrtpproxy ldap oracle osp pa rls -EXTRA_EXCLUDED_MODULES= +EXTRA_EXCLUDED_MODULES=seas bdb dbtext oracle pa rls iptrtpproxy +#EXTRA_EXCLUDED_MODULES= # possible module directories that can appear in MODULES_SP # (only used for deducing a module name) @@ -50,7 +50,7 @@ MDIRS=modules modules_s modules_k # modules packaged in separate packages (complete with full modules_* path) # with the package name: ser-$(module_name)-module -MODULES_SP=modules/db_mysql modules/db_postgress modules/tls modules_s/xmlrpc +MODULES_SP=modules/db_mysql modules/db_postgres modules/tls modules_s/xmlrpc # module groups that are packaged in seperate packages # (with the name ser-$(group_name)-modules)

15 years, 6 months

git:master: Makefile: fix module names

by Klaus Darilion

Module: sip-router Branch: master Commit: 543f9a533699b1d963ee42c4e94f608082a3367c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=543f9a5… Author: darilion <darilion(a)flunder.lan> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Mon Jul 13 13:39:47 2009 +0200 Makefile: fix module names - radius_... --> misc_radius --- Makefile | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 581a907..32b8b2b 100644 --- a/Makefile +++ b/Makefile @@ -132,7 +132,7 @@ endif # widespread usage) and have no external compile or link dependencies (note # that some of these interplay with external systems). module_group_standard=acc_syslog auth avp ctl dispatcher diversion enum\ - eval exec fifo flatstore gflags maxfwd mediaproxy \ + eval exec fifo db_flatstore gflags maxfwd mediaproxy \ nathelper options pdt permissions pike print ratelimit \ registrar rr sanity sl textops timer tm uac unixsock uri \ usrloc xlog cfg_rpc @@ -140,9 +140,9 @@ module_group_standard=acc_syslog auth avp ctl dispatcher diversion enum\ # Modules in this group are considered a standard part of SER (due to # widespread usage) but they have dependencies that must be satisfied for # compilation. -# acc_radius, auth_radius, avp_radius, uri_radius => radiusclient-ng +# acc_radius, auth_radius, misc_radius => radiusclient-ng # acc_db, auth_db, avp_db, db_ops, domain, lcr, msilo, dialog, speeddial, -# uri_db => database module (mysql, postgres, dbtext) +# uri_db => database module (db_mysql, db_postgres, dbtext ...) # mysql, postgres => mysql server and client libraries or postgres server and # client libraries or other database back-end (ex. mysql-devel) # pa, xmlrpc => libxml2 @@ -151,8 +151,8 @@ module_group_standard=acc_syslog auth avp ctl dispatcher diversion enum\ # NOTE! All presence modules (dialog, pa, presence_b2b, rls, xcap) have been # included in this group due to interdependencies module_group_standard_dep=acc_db acc_radius auth_db auth_radius avp_db \ - avp_radius auth_identity \ - db_ops domain lcr msilo mysql dialog pa postgres \ + auth_identity db_ops domain lcr misc_radius \ + msilo dialog pa \ presence_b2b rls speeddial uri_db xcap xmlrpc # For db use (db modules, excluding drivers) @@ -169,7 +169,7 @@ module_group_postgres_driver=db_postgres module_group_postgres=$(module_group_postgres_driver) $(module_group_db) # For radius -module_group_radius=acc_radius auth_radius avp_radius misc_radius peering +module_group_radius=acc_radius auth_radius misc_radius peering # For presence module_group_presence=dialog pa presence_b2b rls xcap @@ -197,7 +197,7 @@ else # Old defaults for backwards compatibility # excluded because they depend on external libraries exclude_modules?= cpl mangler postgres jabber mysql cpl-c \ - auth_radius uri_radius avp_radius \ + auth_radius misc_radius \ acc_radius dialog pa rls presence_b2b xcap xmlrpc\ osp tls oracle \ unixsock dbg print_lib auth_identity ldap \

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev