From 06535e342c729584999693fbb3bef72d2b2ea07d Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 11 Nov 2016 01:46:24 +0200 Subject: [PATCH 1/5] core, modules: typos --- cfg_parser.h | 2 +- modules/corex/doc/corex_admin.xml | 2 +- modules/drouting/doc/drouting_admin.xml | 2 +- sr_module.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cfg_parser.h b/cfg_parser.h index 5ca2065bd89..1883563c798 100644 --- a/cfg_parser.h +++ b/cfg_parser.h @@ -69,7 +69,7 @@ typedef enum cfg_flags { CFG_PREFIX = (1 << 3), /*! \brief The result of cfg_parse_str_val will be in a buffer allocated by - * pkg_malloc, if the destination varaiable contains a pointer to a buffer + * pkg_malloc, if the destination variable contains a pointer to a buffer * already then it will be freed with pkg_free first. */ CFG_STR_PKGMEM = (1 << 4), diff --git a/modules/corex/doc/corex_admin.xml b/modules/corex/doc/corex_admin.xml index b018b665adb..7db5c74db97 100644 --- a/modules/corex/doc/corex_admin.xml +++ b/modules/corex/doc/corex_admin.xml @@ -522,7 +522,7 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } the message for on-wire communication, e.g. to do custom encryption or decryption, compression/decompression etc. of the message sent to or received from remote host. Therefore, except text operations, - no module fucntions or pseudo variables are available in this event route. + no module functions or pseudo variables are available in this event route. diff --git a/modules/drouting/doc/drouting_admin.xml b/modules/drouting/doc/drouting_admin.xml index f3cffd9ef90..e3769c04e03 100644 --- a/modules/drouting/doc/drouting_admin.xml +++ b/modules/drouting/doc/drouting_admin.xml @@ -985,7 +985,7 @@ modparam("drouting", "sort_order", 2) <varname>ruri_avp</varname> (str) The name of the avp for storing Request URIs to be later used - (alternative destiantions for the current one). + (alternative destinations for the current one). Default value is NULL. diff --git a/sr_module.h b/sr_module.h index e42ccdf1dd3..2cbed659d12 100644 --- a/sr_module.h +++ b/sr_module.h @@ -607,7 +607,7 @@ int get_int_fparam(int* dst, struct sip_msg* msg, fparam_t* param); * @param s_dst string destination * @param msg SIP message * @param param function parameters - * @param flags flags to indicate destiantions + * @param flags flags to indicate destinations * @return 0 on success, 1 on error, e.g. cannot get value */ int get_is_fparam(int* i_dst, str* s_dst, struct sip_msg* msg, fparam_t* param, unsigned int *flags); From 72f28fdcfd88b4f915156a992a6b1f12db79edc5 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Mon, 14 Nov 2016 15:50:54 +0200 Subject: [PATCH 2/5] modules/dispatcher: fixed typo in documentation --- modules/dispatcher/doc/dispatcher_admin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/dispatcher/doc/dispatcher_admin.xml b/modules/dispatcher/doc/dispatcher_admin.xml index d857f282425..53fe4fba1f6 100644 --- a/modules/dispatcher/doc/dispatcher_admin.xml +++ b/modules/dispatcher/doc/dispatcher_admin.xml @@ -1167,7 +1167,7 @@ if(ds_select("1", "$var(a)")) { addition to one of the previous flags - the last destination will be set to probing. This mean the destination will be pinged with SIP OPTIONS requests from time to time to detect if it is - up running or down. + up or down. From eaded8a4c90e7d35c91a9101190ff79f161bea51 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Mon, 14 Nov 2016 23:56:45 +0200 Subject: [PATCH 3/5] modules/[tm|db2_ops]: use consistent naming for route names in documentation --- modules/db2_ops/doc/db2_ops.xml | 2 +- modules/tm/doc/functions.xml | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/modules/db2_ops/doc/db2_ops.xml b/modules/db2_ops/doc/db2_ops.xml index 95a1156fa7a..9e979f2fa65 100644 --- a/modules/db2_ops/doc/db2_ops.xml +++ b/modules/db2_ops/doc/db2_ops.xml @@ -277,7 +277,7 @@ Hack which enables using db_ops queries in failure route. - Call it at the beginning of failure_route block. + Call it at the beginning of FAILURE_ROUTE block. <function>db_proper</function> usage diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index 4ad34fcb202..ddc7dd9ed46 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -787,8 +787,7 @@ route { Returns true if the failure route is executed for a branch that did timeout. It can be used from - failure_route and - branch-failure event route. + FAILURE_ROUTE and BRANCH_FAILURE_ROUTE event route. <function>t_branch_timeout</function> usage @@ -1289,7 +1288,7 @@ if (!t_next_contacts()) { was empty and thus there was nothing to do, and returns -1 in case of an error (see syslog). - This function can be used from a BRANCH_FAILURE event route. + This function can be used from a BRANCH_FAILURE_ROUTE event route. <function>t_next_contact_flow</function> usage From 8bd3b8ff291d4f59d7aa8a3a4dd674437e77e8b5 Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 2 Dec 2016 11:01:08 +0200 Subject: [PATCH 4/5] modules/rtpproxy: documentation typo fix and rephrase --- modules/rtpproxy/doc/rtpproxy_admin.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index 49edff78625..d0db7d8a70c 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -456,7 +456,7 @@ rtpproxy_offer(); So, for example if a SIP requests is processed with 'ie' flags, the corresponding response must be processed with 'ie' flags. - Note: As rtpproxy in bridge mode s per default asymmetric, you have to specify + Note: As rtpproxy in bridge mode is asymmetric per default, you have to specify the 'w' flag for clients behind NAT! See also above notes! @@ -764,7 +764,7 @@ rtpproxy_manage(); ... if (is_method("INVITE")) { rtpproxy_offer(); - if (detect_hold()) { + if (is_audio_on_hold()) { rtpproxy_stream2uas("/var/rtpproxy/prompts/music_on_hold", "-1"); } else { rtpproxy_stop_stream2uas(); From 7d8d39b909e13a800be41d6ba510d717a6eff6bd Mon Sep 17 00:00:00 2001 From: Mikko Lehto Date: Fri, 2 Dec 2016 11:23:39 +0200 Subject: [PATCH 5/5] modules/mohqueue: documentation typo fix --- modules/mohqueue/doc/mohqueue_admin.xml | 39 ++++++++++++------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/modules/mohqueue/doc/mohqueue_admin.xml b/modules/mohqueue/doc/mohqueue_admin.xml index 3e53ee7d57b..c589b73a7a7 100644 --- a/modules/mohqueue/doc/mohqueue_admin.xml +++ b/modules/mohqueue/doc/mohqueue_admin.xml @@ -88,7 +88,7 @@ The URL to connect to the database for the mohqueue tables. Set <varname>db_url</varname>: ... -modparam ("mohqueue", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") +modparam("mohqueue", "db_url", "mysql://kamailio:kamailiorw@localhost/kamailio") ... @@ -109,8 +109,8 @@ maintains the call status. Set table names: ... -modparam ("mohqueue", "db_qtable", "mqueues") -modparam ("mohqueue", "db_ctable", "mcalls") +modparam("mohqueue", "db_qtable", "mqueues") +modparam("mohqueue", "db_ctable", "mcalls") ... @@ -131,7 +131,7 @@ queues table. Set default directory for audio files: ... -modparam ("mohqueue", "mohdir", "/var/kamailio/MOH") +modparam("mohqueue", "mohdir", "/var/kamailio/MOH") ... @@ -154,7 +154,7 @@ queues table. Set default directory for audio files: ... -modparam ("mohqueue", "mohdir", "/var/kamailio/MOH") +modparam("mohqueue", "mohdir", "/var/kamailio/MOH") ... @@ -167,7 +167,7 @@ modparam ("mohqueue", "mohdir", "/var/kamailio/MOH")
- <function moreinfo="none">mohq_process ()</function> + <function moreinfo="none">mohq_process()</function> Checks to see if the current SIP message involves a queue. If it @@ -207,8 +207,8 @@ request_route { # main route with limited processing ... # MOH queue? - if (mohq_process ()) { - xlog ("L_DBG", "Handled by mohqueue"); + if (mohq_process()) { + xlog("L_DBG", "Handled by mohqueue"); exit; } # An error or not a MOH queue message; continue processing @@ -221,12 +221,12 @@ request_route {
- <function moreinfo="none">mohq_send (queue_name)</function> + <function moreinfo="none">mohq_send(queue_name)</function> Normally calls enter the queue with an initial INVITE message that 1) has a RURI that matches a queue URI and 2) is passed through -mohq_proc (), which is the preferred method. +mohq_process(), which is the preferred method. This function is used when you wish to send a call into a queue that @@ -254,8 +254,8 @@ can be passed as a literal or pseudo-variable. ... # call is initial INVITE and ready for queue? if (some test) { - if (mohq_send ("main")) { - xlog ("L_DBG", "Sent call to main mohqueue"); + if (mohq_send("main")) { + xlog("L_DBG", "Sent call to main mohqueue"); exit; } # failed to enter queue! @@ -268,7 +268,7 @@ can be passed as a literal or pseudo-variable.
- <function moreinfo="none">mohq_retrieve (queue_name, URI)</function> + <function moreinfo="none">mohq_retrieve(queue_name, URI)</function> Retrieves the oldest call in a queue and redirects it to a URI. @@ -299,12 +299,11 @@ be called from any route. #!define CGROUP "sip:operators@10.211.64.5" ... # redirect oldest call to operator call group - if (mohq_retrieve (MOHQNAME, CGROUP)) { - xlog ("L_DBG", "Retrieved call from mohqueue"); + if (mohq_retrieve(MOHQNAME, CGROUP)) { + xlog("L_DBG", "Retrieved call from mohqueue"); exit; - } - # queue is empty or something went wrong } + # queue is empty or something went wrong ... @@ -312,7 +311,7 @@ be called from any route.
- <function moreinfo="none">mohq_count (queue_name, pvar)</function> + <function moreinfo="none">mohq_count(queue_name, pvar)</function> Finds the number of calls that are in a queue. It will not count @@ -342,9 +341,9 @@ any route. $var(mohq) = "operators"; ... # more than 10 calls? - mohq_count ("$var(mohq)", "$var(mohqcnt)"); + mohq_count("$var(mohq)", "$var(mohqcnt)"); if ($var(mohqcnt) > 10) { - xlog ("L_WARN", "$var(mohq) queue has $var(mohqcnt) calls!"); + xlog("L_WARN", "$var(mohq) queue has $var(mohqcnt) calls!"); } ...