sr-dev

sr-dev@lists.kamailio.org

44307 discussions

[tracker] Comment added: make install fails with a bash syntax error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Daniel-Constantin Mierla (miconda) ---------- Maybe the error comes from missing whitespace between ""; . Can you try with: @for r in $(C_INSTALL_CFGS) "" ; do \ There are lot of 'for' that have the 'do' on the same line, they should fail as well if that is the problem. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment120 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.

14 years, 5 months

git:master: dispatcher(k): updated docs with default value for ds_ping_interval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7560e490b643642e79ed8dd95c575c08906e0608 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7560e49… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 7 21:28:39 2010 +0200 dispatcher(k): updated docs with default value for ds_ping_interval - in source code is 0 - reported by Klaus Darilion --- modules_k/dispatcher/README | 9 +++++---- modules_k/dispatcher/doc/dispatcher_admin.xml | 7 ++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 35b73c3..b458910 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -456,11 +456,12 @@ Note 3.18. ds_ping_interval (int) - With this Method you can define the interval for sending a request to a - failed gateway. This parameter is only used, when the TM-Module is - loaded. If set to “0”, the pinging of failed requests is disabled. + With this parameter you can define the interval for sending a request + to a gateway marked as inactive upon a failed request routing to it. + This parameter is only used, when the TM-Module is loaded. If set to + “0”, the pinging of inactive gateway is disabled. - Default value is “10”. + Default value is “0”. Example 1.19. Set the “ds_ping_interval” parameter ... diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index e7d7012..592e7f9 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -456,13 +456,14 @@ modparam("dispatcher", "force_dst", 1) <section> <title><varname>ds_ping_interval</varname> (int)</title> <para> - With this Method you can define the interval for sending a request to a failed gateway. + With this parameter you can define the interval for sending a request + to a gateway marked as inactive upon a failed request routing to it. This parameter is only used, when the TM-Module is loaded. - If set to <quote>0</quote>, the pinging of failed requests is disabled. + If set to <quote>0</quote>, the pinging of inactive gateway is disabled. </para> <para> <emphasis> - Default value is <quote>10</quote>. + Default value is <quote>0</quote>. </emphasis> </para> <example>

14 years, 5 months

[tracker] Task changed: Cfg parsing error for alias/listen and custom global parameter

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#56 - Cfg parsing error for alias/listen and custom global parameter User who did this: Andrei Pelinescu-Onciul (andrei) Severity: Medium -> Very Low Priority: Normal -> Low More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=56 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.

14 years, 5 months

[tracker] Comment added: Cfg parsing error for alias/listen and custom global parameter

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#56 - Cfg parsing error for alias/listen and custom global parameter User who did this - Andrei Pelinescu-Onciul (andrei) ---------- It happens because of an ambiguity in the grammar with alias and listen followed by a config var. Both alias and listen can have an unquoted host list as value. An unquoted host is a list of IDs separated by '.'. Since EOL is not taken into account (it's considered normal whitespace), alias=foo.bar followed by myvar.msg="..." is interpreted as: alias=foo.bar myvar.msg ="..." <- error An workaround for this (besides not having config variables after alias or host) is to add ';' after alias. E.g.: alias="foo.bar"; myvar.msg="...." I don't think it can be fixed without adding an incompatible config syntax change. We could add a special prefix for config vars. (e.g cfgvar myvar.msg="..."), document it as the right way and add an "obsolete" warning for cfg. vars declared without this prefix. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=56#comment119 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.

14 years, 5 months

[tracker] Comment added: make install fails with a bash syntax error

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#87 - make install fails with a bash syntax error User who did this - Dmitry Goncharov (Dmitry) ---------- Yes, the change is moving 'do' to the next line. This small bash session demonstrates the problem. $ $ git remote -v origin git://git.sip-router.org/sip-router (fetch) origin git://git.sip-router.org/sip-router (push) $ git br * kamailio_3.0 master $ git st # On branch kamailio_3.0 nothing to commit (working directory clean) $ make install-cfg Makefile.defs defs skipped /bin/sh: -c: line 18: syntax error near unexpected token `fi' /bin/sh: -c: line 18: ` fi ; \' make: *** [install-cfg] Error 1 $ patch -p1 < ../kamailio-3.0.3-makefile.diff patching file Makefile $ git diff | cat diff --git a/Makefile b/Makefile index 210d277..90f6b21 100644 --- a/Makefile +++ b/Makefile @@ -918,7 +918,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) fi; \ fi @# other configs - @for r in $(C_INSTALL_CFGS) ""; do \ + @for r in $(C_INSTALL_CFGS) ""; \ + do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ n=`basename "$$r"` ; \ $ make install-cfg Makefile.defs defs skipped # radius dictionary touch //etc/kamailio//dictionary.kamailio install -m 644 etc/dictionary.kamailio //etc/kamailio/ $ $ $ $ bash --version GNU bash, version 4.1.7(1)-release (x86_64-pc-linux-gnu) Copyright (C) 2009 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software; you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. $ make --version GNU Make 3.81 Copyright (C) 2006 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. This program built for x86_64-pc-linux-gnu $ This reproduces on two x86_64 gentoo. This does not reproduce on i686 gentoo with same bash and make. Also, this does not reproduce with bash 3.2.39(1)-release and the same make on i686 ubuntu. Maybe something is broken on both of my x86_64. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=87#comment118 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.

14 years, 5 months

git:master: utils/route_graph: support for event route

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 43c5c9ae5bf8d8d8ff4d6bc106f3c59019f4612a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43c5c9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 7 20:46:22 2010 +0200 utils/route_graph: support for event route --- utils/route_graph/route_graph.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/utils/route_graph/route_graph.py b/utils/route_graph/route_graph.py index cd8ccf2..243b5da 100755 --- a/utils/route_graph/route_graph.py +++ b/utils/route_graph/route_graph.py @@ -32,13 +32,14 @@ max_depth = 10 debug = 0 re_main_route = re.compile("^([a-z]+_)*route[\s\t]*(?![])[\s\t]*\{?", re.I) -re_def_route = re.compile("^([a-z]+_)*route(\[\"?([A-Za-z0-9-_]+)\"?\])+[\s\t]*\{?", re.I) +re_def_route = re.compile("^([a-z]+_)*route(\[\"?([A-Za-z0-9-_:]+)\"?\])+[\s\t]*\{?", re.I) re_call_route = re.compile("^(.*$[\s\t!]*)?route\(\"?([A-Za-z0-9-_]+)\"?$", re.I) routes = {} f_routes = {} b_routes = {} r_routes = {} s_routes = {} +e_routes = {} def log(_s): @@ -114,6 +115,10 @@ while line: rt = b_routes if rname == None: rname = "branch" + elif rtype == "event_": + rt = e_routes + if rname == None: + rname = "event" else: rt = routes log(rname) @@ -133,6 +138,9 @@ while line: elif rtype == "branch_": rt = b_routes rname = "branch" + elif rtype == "event_": + rt = e_routes + rname = "event" else: rt = routes rname = "Main" @@ -145,6 +153,7 @@ log("branch_routes: %s" % (b_routes)) log("failure_routes: %s" % (f_routes)) log("onreply_routes: %s" % (r_routes)) log("onsend_routes: %s" % (s_routes)) +log("event_routes: %s" % (e_routes)) for name in routes.keys(): for val in routes[name]: @@ -191,4 +200,11 @@ if len(r_routes) > 0: for r in r_routes[onr]: traverse_routes(1, r) +if len(e_routes) > 0: + print "\nEvent routes\n--------------" + for onr in e_routes.keys(): + print "\n%s" % (onr) + for r in e_routes[onr]: + traverse_routes(1, r) + print

14 years, 5 months

git:master: tls.cfg: use local file paths

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: f503d0a0b9bb10d9dc445219a7ce98f1d3dc918a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f503d0a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 19:08:09 2010 +0200 tls.cfg: use local file paths Use local paths, relative to the source/compile directory (./modules/tls/*). This allows starting with -A LOCAL_TEST_RUN with one of the sip-router*.cfg without having to edit any path in tls.cfg. On install-cfg, the local path is changed to an absolute path to the installed certificates/keys/ca list (see 0efe88e). --- modules/tls/Makefile | 2 +- modules/tls/tls.cfg | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index f1c0f52..95cf759 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -32,7 +32,7 @@ install-tls-cert: $(cfg_prefix)/$(cfg_dir) install-cfg: install-tls-cert @$(call try_err, $(INSTALL_TOUCH) \ "$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" ) - @sed -e "s#/usr/local/etc/ser/#$(cfg_prefix)/$(cfg_dir)#g" \ + @sed -e "s#\./modules/tls/#$(cfg_prefix)/$(cfg_dir)#g" \ -e "s#ser-selfsigned#$(MAIN_NAME)-selfsigned#g" \ < ./tls.cfg > "$(cfg_prefix)/$(cfg_dir)tls.cfg.sample" @if [ -z "${skip_cfg_install}" -a \ diff --git a/modules/tls/tls.cfg b/modules/tls/tls.cfg index 81d0a43..223d607 100644 --- a/modules/tls/tls.cfg +++ b/modules/tls/tls.cfg @@ -17,8 +17,8 @@ method = TLSv1 verify_certificate = no require_certificate = no -private_key = /usr/local/etc/ser/ser-selfsigned.key -certificate = /usr/local/etc/ser/ser-selfsigned.pem +private_key = ./modules/tls/ser-selfsigned.key +certificate = ./modules/tls/ser-selfsigned.pem # This is the default client domain, settings # in this domain will be used for all outgoing @@ -42,8 +42,8 @@ require_certificate = yes #method = SSLv23 #verify_certificate = yes #require_certificate = no -#private_key = /usr/local/etc/ser/local_key.pem -#certificate = /usr/local/etc/ser/local_cert.pem +#private_key = ./modules/tls/local_key.pem +#certificate = ./modules/tls/local_cert.pem #verify_depth = 3 #ca_list = local_ca.pem @@ -56,6 +56,6 @@ require_certificate = yes # #[client:195.37.77.101:5061] #verify_certificate = no -#certificate = /usr/local/etc/ser/iptel_client.pem -#private_key = /usr/local/etc/ser/iptel_key.pem -#ca_list = /usr/local/etc/ser/iptel_ca.pem +#certificate = ./modules/tls/iptel_client.pem +#private_key = ./modules/tls/iptel_key.pem +#ca_list = ./modules/tls/iptel_ca.pem

14 years, 5 months

git:master: sip-router*.cfg: defines, links, test run support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 99fab38dd345a28262221d1af220933697c1c53d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99fab38… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 18:20:40 2010 +0200 sip-router*.cfg: defines, links, test run support - added links to docs, ser_ctl, serweb and sr-users mailing list address - feature defines compatible with kamailio.cfg: WITH_DEBUG, WITH_TLS, WITH_XMLRPC (can be enabled by uncommenting the corresponding #!define or by starting ser with -A WITH_XXXX) - XMLRPC_TLS_ONLY define: when enabled XMLRPC will be allowed only on TLS and only from clients with valid certificates. - XMLRPC_ALLOW_NET1, XMLRPC_ALLOW_NET2, XMLRPC_ALLOW_NET3 defines: when enabled they must contain a valid network address (e.g. 10.0.0.0/8). xmlrpc requests will be accepted only from localhost (always) and from clients with source addresses matching one of the XMLRPC_ALLOW_NET[1-3] defines. E.g.: ser -A WITH_XMLRPC -A XMLRPC_ALLOW_NET1=10.0.0.0/8 .... - LOCAL_TEST_RUN define: when enabled ser will assume it is not installed and that it is started from the source/compile directory (as opposed to an installed version). All the modules will be searched in modules*/modulename/modulename.so and all the other files referenced in the config will be relative to the working directory (and not the ser config file directory). - multicast replication listen address set to udp only (avoids warnings on startup) - load sl after tm (the new merged sl prints a warning if tm is not loaded first) - use ser instead of sip-router for the DB names/uris and ctl sockets - use a XMLRPC specific route - XMLRPC bug workaround for xmlrpclib (which waits for an EOF before interpreting the response). --- etc/sip-router-basic.cfg | 74 +++++++++++++++++++++---- etc/sip-router-oob.cfg | 135 +++++++++++++++++++++++++++++++++++++++------ etc/sip-router.cfg | 80 +++++++++++++++++++++++++-- 3 files changed, 254 insertions(+), 35 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=99f…

14 years, 5 months

git:master: tls: doc - notes about filename path

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b690ab5236cbe209dd1d80ddcc15bc4c9053c42f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b690ab5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 18:06:53 2010 +0200 tls: doc - notes about filename path - notes about how filename path are resolved in function of the first character. - regenerated README. --- modules/tls/README | 30 +++++++++++++++++++ modules/tls/doc/params.xml | 69 ++++++++++++++++++++++++++++++++++++++----- 2 files changed, 91 insertions(+), 8 deletions(-) diff --git a/modules/tls/README b/modules/tls/README index ed9004d..ac64fdc 100644 --- a/modules/tls/README +++ b/modules/tls/README @@ -321,6 +321,12 @@ modparam("tls", "tls_method", "TLSv1") Sets the certificate file name. The certificate file can also contain the private key in PEM format. + If the file name starts with a '.' the path will be relative to the + working directory (at runtime). If it starts with a '/' it will be an + absolute path and if it starts with anything else the path will be + relative to the main config file directory (e.g.: for ser -f + /etc/ser/ser.cfg it will be relative to /etc/ser/). + Warning: try not to use certificate with keys longer then 1024 bytes. Longer keys will severely impact performance, in particular the TLS connection rate. @@ -336,6 +342,12 @@ modparam("tls", "certificate", "/usr/local/etc/ser/my_certificate.pem") Sets the private key file name. + If the file name starts with a '.' the path will be relative to the + working directory (at runtime). If it starts with a '/' it will be an + absolute path and if it starts with anything else the path will be + relative to the main config file directory (e.g.: for ser -f + /etc/ser/ser.cfg it will be relative to /etc/ser/). + Note: the private key can be contained in the same file as the certificate (just append it to the certificate file, e.g.: cat pkey.pem >> cert.pem) @@ -354,6 +366,12 @@ modparam("tls", "private", "/usr/local/etc/ser/my_pkey.pem") to one of the listed CAs, the authentication will succeed. See also verify_certificate, verify_depth and require_certificate. + If the file name starts with a '.' the path will be relative to the + working directory (at runtime). If it starts with a '/' it will be an + absolute path and if it starts with anything else the path will be + relative to the main config file directory (e.g.: for ser -f + /etc/ser/ser.cfg it will be relative to /etc/ser/). + By default the CA file is not set. An easy way to create the CA list is to append each trusted trusted CA @@ -782,6 +800,12 @@ modparam("tls", "tls_force_run", 11) client) and domain basis (for now only IPs). The corresponding module parameters will be ignored. + If the file name starts with a '.' the path will be relative to the + working directory (at runtime). If it starts with a '/' it will be an + absolute path and if it starts with anything else the path will be + relative to the main config file directory (e.g.: for ser -f + /etc/ser/ser.cfg it will be relative to /etc/ser/). + By default no config file is specified. The following parameters can be set in the config file, for each @@ -795,6 +819,12 @@ modparam("tls", "tls_force_run", 11) * ca_list * cipher_list + All the parameters that take filenames as values will be resolved using + the same rules as for the tls config filename itself: starting with a + '.' means relative to the working directory, a '/' means an absolute + path and anything else a path relative to the directory of the current + ser main config file. + SIP-router acts as a server when it accepts a connection and as a client when it initiates a new connection by itself (it connects to something). diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index 7416d52..90e5020 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -62,10 +62,20 @@ modparam("tls", "tls_method", "TLSv1") <section id="certificate"> <title><varname>certificate</varname> (string)</title> <para> - Sets the certificate file name. The certificate file can also contain the private key in PEM format. + Sets the certificate file name. The certificate file can also contain + the private key in PEM format. </para> <para> - <emphasis>Warning:</emphasis> try not to use certificate with keys longer then 1024 bytes. Longer keys will severely impact performance, in particular the TLS connection rate. + If the file name starts with a '.' the path will be relative to the + working directory (<emphasis>at runtime</emphasis>). If it starts + with a '/' it will be an absolute path and if it starts with anything + else the path will be relative to the main config file directory + (e.g.: for ser -f /etc/ser/ser.cfg it will be relative to /etc/ser/). + </para> + <para> + <emphasis>Warning:</emphasis> try not to use certificate with keys + longer then 1024 bytes. Longer keys will severely impact performance, + in particular the TLS connection rate. </para> <para> The default value is [SER_CFG_DIR]/cert.pem. @@ -86,7 +96,16 @@ modparam("tls", "certificate", "/usr/local/etc/ser/my_certificate.pem") Sets the private key file name. </para> <para> - Note: the private key can be contained in the same file as the certificate (just append it to the certificate file, e.g.: cat pkey.pem >> cert.pem) + If the file name starts with a '.' the path will be relative to the + working directory (<emphasis>at runtime</emphasis>). If it starts + with a '/' it will be an absolute path and if it starts with anything + else the path will be relative to the main config file directory + (e.g.: for ser -f /etc/ser/ser.cfg it will be relative to /etc/ser/). + </para> + <para> + Note: the private key can be contained in the same file as the + certificate (just append it to the certificate file, e.g.: + cat pkey.pem >> cert.pem) </para> <para> The default value is [SER_CFG_DIR]/cert.pem. @@ -104,13 +123,27 @@ modparam("tls", "private", "/usr/local/etc/ser/my_pkey.pem") <section id="ca_list"> <title><varname>ca_list</varname> (string)</title> <para> - Sets the CA list file name. This file contains a list of all the trusted CAs certificates. If a signature in a certificate chain belongs to one of the listed CAs, the authentication will succeed. See also <emphasis>verify_certificate</emphasis>, <emphasis>verify_depth</emphasis> and <emphasis>require_certificate</emphasis>. + Sets the CA list file name. This file contains a list of all the + trusted CAs certificates. If a signature in a certificate chain belongs + to one of the listed CAs, the authentication will succeed. See also + <emphasis>verify_certificate</emphasis>, + <emphasis>verify_depth</emphasis> and + <emphasis>require_certificate</emphasis>. + </para> + <para> + If the file name starts with a '.' the path will be relative to the + working directory (<emphasis>at runtime</emphasis>). If it starts + with a '/' it will be an absolute path and if it starts with anything + else the path will be relative to the main config file directory + (e.g.: for ser -f /etc/ser/ser.cfg it will be relative to /etc/ser/). </para> <para> By default the CA file is not set. </para> <para> - An easy way to create the CA list is to append each trusted trusted CA certificate in the PEM format to one file, e.g.: for f in trusted_cas/*.pem ; do cat "$f" >> ca_list.pem ; done . + An easy way to create the CA list is to append each trusted trusted CA + certificate in the PEM format to one file, e.g.: for f in + trusted_cas/*.pem ; do cat "$f" >> ca_list.pem ; done . </para> <example> <title>Set <varname>ca_list</varname> parameter</title> @@ -760,13 +793,24 @@ modparam("tls", "tls_force_run", 11) Sets the name of the TLS specific config file. </para> <para> - If set the TLS module will load a special config file, in which different TLS parameters can be specified on a per role (server or client) and domain basis (for now only IPs). The corresponding module parameters will be ignored. + If set the TLS module will load a special config file, in which + different TLS parameters can be specified on a per role (server or + client) and domain basis (for now only IPs). The corresponding module + parameters will be ignored. + </para> + <para> + If the file name starts with a '.' the path will be relative to the + working directory (<emphasis>at runtime</emphasis>). If it starts + with a '/' it will be an absolute path and if it starts with anything + else the path will be relative to the main config file directory + (e.g.: for ser -f /etc/ser/ser.cfg it will be relative to /etc/ser/). </para> <para> By default no config file is specified. </para> <para> - The following parameters can be set in the config file, for each domain: + The following parameters can be set in the config file, for each + domain: </para> <itemizedlist> <listitem><para>tls_method</para></listitem> @@ -779,7 +823,16 @@ modparam("tls", "tls_force_run", 11) <listitem><para>cipher_list</para></listitem> </itemizedlist> <para> - SIP-router acts as a server when it accepts a connection and as a client when it initiates a new connection by itself (it connects to something). + All the parameters that take filenames as values will be resolved + using the same rules as for the tls config filename itself: starting + with a '.' means relative to the working directory, a '/' means an + absolute path and anything else a path relative to the directory of + the current ser main config file. + </para> + <para> + SIP-router acts as a server when it accepts a connection and as a + client when it initiates a new connection by itself (it connects to + something). </para> <example> <title>Short config file</title>

14 years, 5 months

git:master: cfg_parser: allow relative paths for the cfg file

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 139913192cb9e9616680a3a430a4039da9beb718 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1399131… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 17:03:53 2010 +0200 cfg_parser: allow relative paths for the cfg file Allow relative parhs in the cfg_parser framework (used by the tls module, ldap(s) and iptrtpproxy), by adding a new "basedir" parameter to cfg_parser_init(). If basedir == 0 and the filename does not start with '/', the filename path will be considered to be relative to the main ser config file (e.g. ser -f /etc/ser/ser.cfg => relative to /etc/ser/ ). This was the previous behaviour. If basedir == "" the filename path will be considered to be relative to the working directory (ser -w /tmp => relative to /tmp). For other basedir values, the filename path will be considered to be relative to basedir. --- cfg_parser.c | 32 +++++++++++++++++++++++--------- cfg_parser.h | 2 +- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/cfg_parser.c b/cfg_parser.c index 0827939..fa8721b 100644 --- a/cfg_parser.c +++ b/cfg_parser.c @@ -612,19 +612,33 @@ static char* get_base_name(str* filename) } -cfg_parser_t* cfg_parser_init(str* filename) + +/** intialize the config parser. + * @param basedir - path to the config file name. If 0 the path + * (base directory) of the main ser.cfg file will be used, else + * basedir will be concatenated to the filename. It will be + * used only if filename is not an absolute path. + * @param filename - config filename (can include path elements). + * @return 0 on error, !=0 on success. + */ +cfg_parser_t* cfg_parser_init(str* basedir, str* filename) { cfg_parser_t* st; - char* pathname, *base; + char* pathname, *base, *abs_pathname; - pathname = NULL; + abs_pathname = NULL; + pathname = filename->s; st = NULL; base = NULL; - if ((pathname = get_abs_pathname(NULL, filename)) == NULL) { - ERR("cfg_parser: Error while converting %.*s to absolute pathname\n", - STR_FMT(filename)); - goto error; + /* if basedir == 0 or != "" get_abs_pathname */ + if (basedir == 0 || basedir->len != 0) { + if ((abs_pathname = get_abs_pathname(basedir, filename)) == NULL) { + ERR("cfg_parser: Error while converting %.*s to absolute" + " pathname\n", STR_FMT(filename)); + goto error; + } + pathname = abs_pathname; } if ((base = get_base_name(filename)) == NULL) goto error; @@ -640,7 +654,7 @@ cfg_parser_t* cfg_parser_init(str* filename) goto error; } - pkg_free(pathname); + if (abs_pathname) pkg_free(abs_pathname); st->file = base; st->line = 1; @@ -653,7 +667,7 @@ cfg_parser_t* cfg_parser_init(str* filename) pkg_free(st); } if (base) pkg_free(base); - if (pathname) pkg_free(pathname); + if (abs_pathname) pkg_free(abs_pathname); return NULL; } diff --git a/cfg_parser.h b/cfg_parser.h index 4399b6c..11296c5 100644 --- a/cfg_parser.h +++ b/cfg_parser.h @@ -151,7 +151,7 @@ typedef struct cfg_parser { extern struct cfg_option cfg_bool_values[]; -struct cfg_parser* cfg_parser_init(str* filename); +struct cfg_parser* cfg_parser_init(str* basedir, str* filename); void cfg_section_parser(struct cfg_parser* st, cfg_func_f parser, void* param);

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev