sr-dev

sr-dev@lists.kamailio.org

15 participants
44234 discussions

git:master: remove shm_str_dup() from tls_util.[c|h] as it breaks compilation and is not used at all

by Klaus Darilion

Module: sip-router Branch: master Commit: 07afde0840cb537b281c250b34f0fd9e9576410c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=07afde0… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: Klaus Darilion <klaus.mailinglists(a)pernau.at> Date: Wed Jul 1 14:36:11 2009 +0200 remove shm_str_dup() from tls_util.[c|h] as it breaks compilation and is not used at all --- modules_s/tls/tls_util.c | 26 -------------------------- modules_s/tls/tls_util.h | 8 -------- 2 files changed, 0 insertions(+), 34 deletions(-) diff --git a/modules_s/tls/tls_util.c b/modules_s/tls/tls_util.c index c2ac186..2b45531 100644 --- a/modules_s/tls/tls_util.c +++ b/modules_s/tls/tls_util.c @@ -40,32 +40,6 @@ /* - * Make a shared memory copy of str string - * Return value: -1 on error - * 0 on success - */ -int shm_str_dup(char** dest, str* val) -{ - char* ret; - - if (!val) { - *dest = NULL; - return 0; - } - - ret = shm_malloc(val->len + 1); - if (!ret) { - ERR("No memory left\n"); - return 1; - } - memcpy(ret, val->s, val->len); - ret[val->len] = '\0'; - *dest = ret; - return 0; -} - - -/* * Make a shared memory copy of ASCII zero terminated string * Return value: -1 on error * 0 on success diff --git a/modules_s/tls/tls_util.h b/modules_s/tls/tls_util.h index f699889..701ba2b 100644 --- a/modules_s/tls/tls_util.h +++ b/modules_s/tls/tls_util.h @@ -61,14 +61,6 @@ do { \ /* - * Make a shared memory copy of str string - * Return value: -1 on error - * 0 on success - */ -int shm_str_dup(char** dest, str* val); - - -/* * Make a shared memory copy of ASCII zero terminated string * Return value: -1 on error * 0 on success

15 years, 6 months

how to compile sr with TLS?

by Klaus Darilion

Hi! What is the suggested way to build sr with TLS? Is it "TLS=1 make" or "TLS_HOOKS=1 make" or do I have to just remove tls from excluded modules? Or a combination? I think there is some cleanup needed as well. regards klaus

15 years, 6 months

git:master: cfg framework: documentation for cfg_read_var*

by Miklos Tirpak

Module: sip-router Branch: master Commit: 249df0253d2ef8fa3948ce50a4a76ba8f256fd1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=249df02… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Wed Jul 1 14:23:09 2009 +0200 cfg framework: documentation for cfg_read_var* - How to read the variables of another module, core, or the script is documented. - cfg_read_var() fixed -- it did not allow reading the variables that had a fixup function. --- cfg/cfg_select.c | 7 ------- doc/cfg.txt | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index 45aeb94..4374aa6 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -274,13 +274,6 @@ int read_cfg_var_fixup(char *gname, char *vname, struct cfg_read_handle *read_ha return 0; } - if (var->def->on_change_cb) { - /* fixup function is defined -- safer to return an error - than an incorrect value */ - LOG(L_ERR, "ERROR: read_cfg_var_fixup(): variable cannot be retrieved\n"); - return -1; - } - read_handle->group = (void *)group; read_handle->var = (void *)var; return 1; diff --git a/doc/cfg.txt b/doc/cfg.txt index 19b0e53..93d2c77 100644 --- a/doc/cfg.txt +++ b/doc/cfg.txt @@ -166,6 +166,45 @@ cfg_get(foo, cfg_handle, s) 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 +the variable: + +cfg_get(bar, cfg_handle_of_bar, j); + +2) Access the variables by their group and variable name: + +#include "../../cfg/cfg_select.h" + +struct cfg_read_handle var_bar_j; + +in the module init function: +static int mod_init(void) +{ + if ((read_cfg_var_fixup("bar", "j", &var_bar_j)) < 0) + return -1; + /* Note that the variable may or may not exist at this point + * depending on the module loading order. The fixup will still + * be successful but the variable cannot be read if it has not been + * declared yet. If the variable will not be declared at all + * SER will fail to start + */ +} + +int j; +if ((cfg_read_var_int(&var_bar_j, &j)) < 0) { error... } + +or similarly, +str s; +if ((cfg_read_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. + 3. Using the framework in the core ===============================================================================

15 years, 6 months

SF.net SVN: openser:[5888] trunk/etc/kamailio.cfg

by Inaki Baz Castillo

Revision: 5888 http://openser.svn.sourceforge.net/openser/?rev=5888&view=rev Author: ibc_sf Date: 2009-07-01 11:31:07 +0000 (Wed, 01 Jul 2009) Log Message: ----------- - Some typos in "is_method()" function. Modified Paths: -------------- trunk/etc/kamailio.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

SF.net SVN: openser:[5887] trunk/etc/kamailio.cfg

by Inaki Baz Castillo

Revision: 5887 http://openser.svn.sourceforge.net/openser/?rev=5887&view=rev Author: ibc_sf Date: 2009-07-01 11:28:21 +0000 (Wed, 01 Jul 2009) Log Message: ----------- - Fixed registration behind NAT (missing "setbflag(6)"). Credits to Rub?\195?\169n Rojas (sr-users-es). Modified Paths: -------------- trunk/etc/kamailio.cfg This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

kamailio at linuxtag 2009

by Henning Westerholt

Hi all, i'm pleased to announce that i give a talk about the kamailio project on the linuxtag 2009 in Berlin. The title of the talk is "Building carrier grade voice over IP systems with kamailio", on wednesday the 24th june afternoon. Further details can be found in the conference program at: http://www.linuxtag.org/2009/de/program/freies-vortragsprogramm/mittwoch/vo… I'll be also present on the linuxtag on thursday, so if you would like to meet for some discussions, just drop me a mail (off-list). With best regards, Henning Westerholt

15 years, 6 months

git:master: Add missed <sys/select.h> include.

by Maxim Sobolev

Module: sip-router Branch: master Commit: bdec66211cb75de63ee63b29ee3372739f4d283e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bdec662… Author: sobomax <sobomax(a)sippysoft.com> Committer: sobomax <sobomax(a)sippysoft.com> Date: Wed Jul 1 02:47:01 2009 -0700 Add missed <sys/select.h> include. --- ut.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/ut.h b/ut.h index 28c0e96..1d207bd 100644 --- a/ut.h +++ b/ut.h @@ -51,6 +51,7 @@ #include "comp_defs.h" #include <sys/types.h> +#include <sys/select.h> #include <sys/time.h> #include <limits.h> #include <time.h>

15 years, 6 months

build problems: K's acc module

by Klaus Darilion

Hi! When enabling Diameter support the is a problem in acc moduel: gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -I/usr/local/include -DNAME='"ser"' -DVERSION='"2.99.0-dev01-serk"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2099000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DSQL_ACC -DRAD_ACC -DDIAM_ACC -DOPENSER_MOD_INTERFACE -DMOD_NAME='"acc"' -c acc_mod.c -o acc_mod.o acc_mod.c: In function 'mod_init': acc_mod.c:507: warning: implicit declaration of function 'flag_idx2mask' looks like flag_idx2mask needs to be added to flags.[c|h] (also needed for siptrace module) regards klaus

15 years, 6 months

[ openser-Bugs-2814137 ] force_rtp_proxy bug

by SourceForge.net

Bugs item #2814137, was opened at 2009-06-29 19:29 Message generated for change (Comment added) made by marcushunger You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&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: ver 1.5.x Status: Open Resolution: None Priority: 5 Private: No Submitted By: Marcus Hunger (marcushunger) Assigned to: Nobody/Anonymous (nobody) Summary: force_rtp_proxy bug Initial Comment: force_rtp_proxy seems to handle re-invite wrong, resulting in one-way-audio. ---------------------------------------------------------------------- >Comment By: Marcus Hunger (marcushunger) Date: 2009-07-01 11:14 Message: sdp is in invite and 200 ok. the thing is, nearly the same config still worked in 1.2-branch, but after an upgrade to 1.4 it stopped. it happens always, no matter if the callee or caller does the reinvite. the following trace shows what happens. the rtpproxy-port in invite and reply is 41324. they must differ as they are used for different media-streams. 217.10.1.1 - sip-proxy & rtpproxy 172.20.21.2 - sip-proxy doing rtpproxy_* stuff 217.10.66.165 - uac 217.10.1.2 - uas U 217.10.1.1:5060 -> 172.20.21.2:5060 INVITE sip:3993942p0@217.10.1.2 SIP/2.0. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. Route: <sip:172.20.21.2;lr=on>. CSeq: 4 INVITE. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. Contact: <sip:3993942e1@217.10.66.165:61020>. Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER. User-Agent: PolycomSoundPointIP-SPIP_650-UA/2.1.2.0078. Supported: 100rel,replaces. Allow-Events: talk,hold,conference. Max-Forwards: 69. Content-Type: application/sdp. Content-Length: 297. X-hint: rr-enforced. X-nathint: nat. . v=0. o=- 1246290867 1246290869 IN IP4 192.168.234.24. s=Polycom IP Phone. c=IN IP4 192.168.234.24. t=0 0. m=audio 2262 RTP/AVP 9 0 8 18 101. a=sendrecv. a=rtpmap:9 G722/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:8 PCMA/8000. a=rtpmap:18 G729/8000. a=rtpmap:101 telephone-event/8000. a=direction:active. # U 172.20.21.2:5060 -> 217.10.1.1:5060 SIP/2.0 100 Giving a try. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. CSeq: 4 INVITE. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. Content-Length: 0. . # U 172.20.21.2:5060 -> 217.10.1.2:5060 INVITE sip:3993942p0@217.10.1.2 SIP/2.0. Via: SIP/2.0/UDP 172.20.21.2;branch=z9hG4bKe2fc.9dcfa89.0. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. CSeq: 4 INVITE. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. Contact: <sip:3993942e1@217.10.66.165:61020>. Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER. User-Agent: PolycomSoundPointIP-SPIP_650-UA/2.1.2.0078. Supported: 100rel,replaces. Allow-Events: talk,hold,conference. Max-Forwards: 68. Content-Type: application/sdp. Content-Length: 315. X-hint: rr-enforced. X-nathint: nat. . v=0. o=- 1246290867 1246290869 IN IP4 192.168.234.24. s=Polycom IP Phone. c=IN IP4 217.10.1.1. t=0 0. m=audio 41324 RTP/AVP 9 0 8 18 101. a=sendrecv. a=rtpmap:9 G722/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:8 PCMA/8000. a=rtpmap:18 G729/8000. a=rtpmap:101 telephone-event/8000. a=direction:active. a=nortpproxy:yes. # U 217.10.1.2:5060 -> 172.20.21.2:5060 SIP/2.0 100 Trying. Via: SIP/2.0/UDP 172.20.21.2;branch=z9hG4bKe2fc.9dcfa89.0;received=172.20.21.2. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. CSeq: 4 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY. Supported: replaces, timer. Contact: <sip:3993942p0@217.10.1.2>. Content-Length: 0. . # U 217.10.1.2:5060 -> 172.20.21.2:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 172.20.21.2;branch=z9hG4bKe2fc.9dcfa89.0;received=172.20.21.2. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. CSeq: 4 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY. Supported: replaces, timer. Contact: <sip:3993942p0@217.10.1.2>. Content-Type: application/sdp. Content-Length: 329. . v=0. o=root 647471219 647471221 IN IP4 217.10.1.2. s=sipgate VoIP GW. c=IN IP4 217.10.1.2. t=0 0. m=audio 17732 RTP/AVP 8 0 18 101. a=rtpmap:8 PCMA/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:18 G729/8000. a=fmtp:18 annexb=no. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=silenceSupp:off - - - -. a=ptime:20. a=sendrecv. ## U 172.20.21.2:5060 -> 217.10.1.1:5060 SIP/2.0 200 OK. Via: SIP/2.0/UDP 217.10.1.1:5060;branch=z9hG4bK78fccbad7757B75A. Via: SIP/2.0/UDP 192.168.234.24;rport=61020;received=217.10.66.165;branch=z9hG4bK78fccbad7757B75A. From: "Erika" <sip:3993942e1@sipgate.de>;tag=D6DBB0FD-C198C6EA. To: <sip:10@sipgate.de;user=phone>;tag=as3804b1ae. Call-ID: e521bbee-f129e0af-f6e95884(a)192.168.234.24. CSeq: 4 INVITE. Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, SUBSCRIBE, NOTIFY. Supported: replaces, timer. Contact: <sip:3993942p0@217.10.1.2>. Content-Type: application/sdp. Content-Length: 347. . v=0. o=root 647471219 647471221 IN IP4 217.10.1.2. s=sipgate VoIP GW. c=IN IP4 217.10.1.1. t=0 0. m=audio 41324 RTP/AVP 8 0 18 101. a=rtpmap:8 PCMA/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:18 G729/8000. a=fmtp:18 annexb=no. a=rtpmap:101 telephone-event/8000. a=fmtp:101 0-16. a=silenceSupp:off - - - -. a=ptime:20. a=sendrecv. a=nortpproxy:yes. ---------------------------------------------------------------------- Comment By: Klaus Darilion (klaus_darilion) Date: 2009-07-01 08:53 Message: do you have a SIP trace? Is it maybe related to late offer (SDP in 200 OK and ACK)? Does the bug happens always or only if the reINVITE is sent by the callee? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-06-30 15:15 Message: in detail, the sdp is rewritten with the wrong port for this direction of the session. it's the same as the answer's which does not work. to build the query for the rtp-proxy from- and to-tag the have to be reversed in this case. ---------------------------------------------------------------------- Comment By: Marcus Hunger (marcushunger) Date: 2009-06-30 11:45 Message: happens when i handle a reinvite with rtpproxy_offer("l") ---------------------------------------------------------------------- Comment By: Daniel-Constantin Mierla (miconda) Date: 2009-06-29 20:19 Message: When is this happening? ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2814137&group_…

15 years, 6 months

git:master: cfg framework: read variables by name with a handle

by Miklos Tirpak

Module: sip-router Branch: master Commit: bcf3fff9389fc06a0fcc92f7e9875b185929987f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcf3fff… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Jun 30 17:33:52 2009 +0200 cfg framework: read variables by name with a handle - read_cfg_var() is introduced which allows reading even the custom declared variables from the modules. It requires a handle returned by read_cfg_var_fixup() - read_cfg_var_int() and read_cfg_var_str() are wrapper functions --- cfg/cfg_ctx.c | 4 +- cfg/cfg_ctx.h | 4 ++ cfg/cfg_select.c | 142 +++++++++++++++++++++++++++++++++++++++++++++++++++++- cfg/cfg_select.h | 24 +++++++++ 4 files changed, 171 insertions(+), 3 deletions(-) diff --git a/cfg/cfg_ctx.c b/cfg/cfg_ctx.c index 04ee5f1..ef3661c 100644 --- a/cfg/cfg_ctx.c +++ b/cfg/cfg_ctx.c @@ -129,7 +129,7 @@ void cfg_notify_drivers(char *group_name, int group_name_len, cfg_def_t *def) static char *temp_string = NULL; /* convert the value to the requested type */ -static int convert_val(unsigned int val_type, void *val, +int convert_val(unsigned int val_type, void *val, unsigned int var_type, void **new_val) { static str s; @@ -482,7 +482,7 @@ static int cfg_var_size(cfg_mapping_t *var) return sizeof(void *); default: - LOG(L_CRIT, "BUG: cfg_var_sizeK(): unknown type: %u\n", + LOG(L_CRIT, "BUG: cfg_var_size(): unknown type: %u\n", CFG_VAR_TYPE(var)); return 0; } diff --git a/cfg/cfg_ctx.h b/cfg/cfg_ctx.h index 07cf734..e738c96 100644 --- a/cfg/cfg_ctx.h +++ b/cfg/cfg_ctx.h @@ -108,6 +108,10 @@ int cfg_help(cfg_ctx_t *ctx, str *group_name, str *var_name, /* notify the drivers about the new config definition */ void cfg_notify_drivers(char *group_name, int group_name_len, cfg_def_t *def); +/* convert the value to the requested type */ +int convert_val(unsigned int val_type, void *val, + unsigned int var_type, void **new_val); + /* initialize the handle for cfg_get_group_next() */ #define cfg_get_group_init(handle) \ (*(handle)) = (void *)cfg_group diff --git a/cfg/cfg_select.c b/cfg/cfg_select.c index 72168d7..45aeb94 100644 --- a/cfg/cfg_select.c +++ b/cfg/cfg_select.c @@ -33,6 +33,7 @@ #include "../select.h" #include "../ut.h" #include "cfg_struct.h" +#include "cfg_ctx.h" #include "cfg_select.h" /* It may happen that the select calls cannot be fixed up before shmizing @@ -200,7 +201,7 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) if (!group || !var) return -1; /* use the module's handle to access the variable, so the variables - are read from private memory */ + are read from the local config */ p = *(group->handle) + var->offset; switch (CFG_VAR_TYPE(var)) { @@ -220,6 +221,145 @@ int select_cfg_var(str *res, select_t *s, struct sip_msg *msg) memcpy(res, p, sizeof(str)); break; + default: + LOG(L_DBG, "DEBUG: select_cfg_var(): unsupported variable type: %d\n", + CFG_VAR_TYPE(var)); + return -1; } return 0; } + +/* fix-up function for read_cfg_var() + * + * return value: + * >0 - success + * 0 - the variable has not been declared yet, but it will be automatically + * fixed-up later. + * <0 - error + */ +int read_cfg_var_fixup(char *gname, char *vname, struct cfg_read_handle *read_handle) +{ + cfg_group_t *group; + cfg_mapping_t *var; + str group_name, var_name; + + if (!gname || !vname || !read_handle) + return -1; + + group_name.s = gname; + group_name.len = strlen(gname); + var_name.s = vname; + var_name.len = strlen(vname); + + /* look-up the group and the variable */ + if (cfg_lookup_var(&group_name, &var_name, &group, &var)) { + if (cfg_shmized) { + LOG(L_ERR, "ERROR: read_cfg_var_fixup(): unknown variable: %.*s.%.*s\n", + group_name.len, group_name.s, + var_name.len, var_name.s); + return -1; + } + /* The variable was not found, add it to the non-fixed select list. + * So we act as if the fixup was successful, and we retry it later */ + if (cfg_new_select(&group_name, &var_name, + &read_handle->group, &read_handle->var)) + return -1; + + LOG(L_DBG, "DEBUG: read_cfg_var_fixup(): cfg read fixup is postponed: %.*s.%.*s\n", + group_name.len, group_name.s, + var_name.len, var_name.s); + + read_handle->group = NULL; + read_handle->var = NULL; + return 0; + } + + if (var->def->on_change_cb) { + /* fixup function is defined -- safer to return an error + than an incorrect value */ + LOG(L_ERR, "ERROR: read_cfg_var_fixup(): variable cannot be retrieved\n"); + return -1; + } + + read_handle->group = (void *)group; + read_handle->var = (void *)var; + return 1; +} + +/* read the value of a variable via a group and variable name previously fixed up + * Returns the type of the variable + */ +unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val) +{ + cfg_group_t *group; + cfg_mapping_t *var; + void *p; + static str s; + + if (!val || !read_handle || !read_handle->group || !read_handle->var) + return 0; + + 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; + + switch (CFG_VAR_TYPE(var)) { + case CFG_VAR_INT: + *val = (void *)(long)*(int *)p; + break; + + case CFG_VAR_STRING: + *val = (void *)*(char **)p; + break; + + case CFG_VAR_STR: + memcpy(&s, p, sizeof(str)); + *val = (void *)&s; + break; + + case CFG_VAR_POINTER: + *val = *(void **)p; + break; + + } + return CFG_VAR_TYPE(var); +} + +/* wrapper function for read_cfg_var() -- convert the value to integer + * returns -1 on error, 0 on success + */ +int read_cfg_var_int(struct cfg_read_handle *read_handle, int *val) +{ + unsigned int type; + void *v1, *v2; + + if ((type = read_cfg_var(read_handle, &v1)) == 0) + return -1; + + if (convert_val(type, v1, CFG_INPUT_INT, &v2)) + return -1; + + *val = (int)(long)(v2); + return 0; +} + +/* wrapper function for read_cfg_var() -- convert the value to str + * returns -1 on error, 0 on success + */ +int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val) +{ + unsigned int type; + void *v1, *v2; + + if ((type = read_cfg_var(read_handle, &v1)) == 0) + return -1; + + if (convert_val(type, v1, CFG_INPUT_STR, &v2)) + return -1; + + *val = *(str *)(v2); + return 0; +} diff --git a/cfg/cfg_select.h b/cfg/cfg_select.h index 9f9b186..6a03dd2 100644 --- a/cfg/cfg_select.h +++ b/cfg/cfg_select.h @@ -34,6 +34,11 @@ #include "../select.h" +struct cfg_read_handle { + void *group; + void *var; +}; + /* free the list of not yet fixed selects */ void cfg_free_selects(); @@ -42,4 +47,23 @@ int cfg_fixup_selects(); int select_cfg_var(str *res, select_t *s, struct sip_msg *msg); +/* fix-up function for read_cfg_var() + * + * return value: + * >0 - success + * 0 - the variable has not been declared yet, but it will be automatically + * fixed-up later. + * <0 - error + */ +int read_cfg_var_fixup(char *gname, char *vname, struct cfg_read_handle *read_handle); + +/* read the value of a variable via a group and variable name previously fixed up + * Returns the type of the variable + */ +unsigned int read_cfg_var(struct cfg_read_handle *read_handle, void **val); + +/* wrapper functions for read_cfg_var() -- convert the value to the requested format */ +int read_cfg_var_int(struct cfg_read_handle *read_handle, int *val); +int read_cfg_var_str(struct cfg_read_handle *read_handle, str *val); + #endif /* _CFG_SELECT_H */

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