sr-dev December 2012

sr-dev@lists.kamailio.org

34 participants
438 discussions

git:master: registrar(k): use only pre-existing branches in lookup_branches ()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: be0f77ec7fa86f9387393609fbdffafd65a1afe3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be0f77e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 23 19:32:03 2012 +0100 registrar(k): use only pre-existing branches in lookup_branches() --- modules_k/registrar/lookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index f98887a..e3553db 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -387,7 +387,7 @@ int lookup_branches(sip_msg_t *msg, udomain_t *d) ruri_b_reg_id = msg->reg_id; reset_ruri_branch(msg); - for(i=0; i<nr_branches; i++) { + for(i=0; i<nr_branches_start; i++) { crt = get_sip_branch(i); /* it has to be a clean branch to do lookup for it */ if(crt->len <= 0 || crt->dst_uri_len > 0

11 years, 4 months

git:master: p_usrloc: clean memory in case of malloc error

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: c50a8ba36aee8ae53d66a8128300085934d1a3f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c50a8ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Dec 23 17:19:21 2012 +0100 p_usrloc: clean memory in case of malloc error --- modules_k/p_usrloc/ucontact.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules_k/p_usrloc/ucontact.c b/modules_k/p_usrloc/ucontact.c index 1340221..10defc5 100644 --- a/modules_k/p_usrloc/ucontact.c +++ b/modules_k/p_usrloc/ucontact.c @@ -105,6 +105,8 @@ error: if (c->user_agent.s) shm_free(c->user_agent.s); if (c->callid.s) shm_free(c->callid.s); if (c->c.s) shm_free(c->c.s); + if (c->ruid.s) shm_free(c->ruid.s); + if (c->instance.s) shm_free(c->instance.s); shm_free(c); return 0; }

11 years, 4 months

sdp info?

by madhumanjusha＠integramicro.com

Hello, I am working on welcome announcement,I have to play an announcement in ekiga after an INVITE Message sent to kamailio.I require sdp information which should be edited as per welcome announcement,which file gives me sdp info of INVITE Message?? As per developer's guide, struct sip_msg should consist of struct sdp_info, but in kamailio code,it is no where present uder sip_msg. So,How would i get sdp information?? Thanks & Regards, Manjusha A. Integra Micro Software Services (P) Ltd.

11 years, 4 months

git:master: Changing to kamcmd

by Olle E. Johansson

Module: sip-router Branch: master Commit: 90432f0e672c5fb11b1e47b9655768bf20e45b89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90432f0… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 10:22:19 2012 +0100 Changing to kamcmd --- utils/sercmd/EXAMPLES | 42 ++++++++++++++++++---------------- utils/sercmd/{sercmd.8 => kamcmd.8} | 0 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/utils/sercmd/EXAMPLES b/utils/sercmd/EXAMPLES index 079dc6a..5278069 100644 --- a/utils/sercmd/EXAMPLES +++ b/utils/sercmd/EXAMPLES @@ -1,59 +1,61 @@ # $id$ -sercmd usage examples +kamcmd usage examples help: - sercmd -h + kamcmd -h -use an udp ser control socket: - ser config: +* use an udp kamailio control socket: +===================================== + Kamailio config: loadmodule "modules/ctl/ctl.so" modparam("ctl", "binrpc", "udp:localhost:2046") modparam("ctl", "binrpc", "tcp:localhost:2046") modparam("ctl", "binrpc", "unixs:/tmp/unix_stream") modparam("ctl", "binrpc", "unixd:/tmp/unix_dgram") - sercmd: - sercmd -s udp:localhost:2046 core.version + kamcmd: + kamcmd -s udp:localhost:2046 core.version use a tcp socket: - sercmd -s tcp:localhost:2046 core.version + kamcmd -s tcp:localhost:2046 core.version use a stream unix socket: - sercmd -s unixs:/tmp/unix_stream core.version + kamcmd -s unixs:/tmp/unix_stream core.version use a datagram unix socket: - sercmd -s unixd:/tmp/unix_dgram core.version - + kamcmd -s unixd:/tmp/unix_dgram core.version +* Command help +============== list available commands on ser side: - sercmd -s unixd:/tmp/unix_drgam ls + kamcmd -s unixd:/tmp/unix_drgam ls -list all available commands (including sercmd builtins or aliases): - sercmd -s unixd:/tmp/unix_dgram ? +list all available commands (including kamcmd builtins or aliases): + kamcmd -s unixd:/tmp/unix_dgram ? or - sercmd -s unixd:/tmp/unix_dgram help + kamcmd -s unixd:/tmp/unix_dgram help get help on one command: - sercmd -s unixd:/tmp/unix_dgram help core.ps + kamcmd -s unixd:/tmp/unix_dgram help core.ps list ser processes: - sercmd -s unixd:/tmp/unix_dgram ps + kamcmd -s unixd:/tmp/unix_dgram ps send an rpc command to ser: - sercmd -s unixd:/tmp/unix_dgram core.shmmem + kamcmd -s unixd:/tmp/unix_dgram core.shmmem format the output: - sercmd -s unixd:/tmp/unix_dgram -f 'pid:%v desc:"%v"\n' core.ps + kamcmd -s unixd:/tmp/unix_dgram -f 'pid:%v desc:"%v"\n' core.ps (note: you could use just ps instead of core.ps) format the output as csv: - sercmd -s unixd:/tmp/unix_dgram -f '%v,' core.ps + kamcmd -s unixd:/tmp/unix_dgram -f '%v,' core.ps enter interactive mode: - sercmd -s unixd:/tmp/unix_dgram + kamcmd -s unixd:/tmp/unix_dgram (note: type help,or ? to see the command list, tab expansion should also work) diff --git a/utils/sercmd/sercmd.8 b/utils/sercmd/kamcmd.8 similarity index 100% rename from utils/sercmd/sercmd.8 rename to utils/sercmd/kamcmd.8

11 years, 4 months

git:master: Revert "Changing to kamcmd"

by Olle E. Johansson

Module: sip-router Branch: master Commit: 7f7605bd38f76ab9adf1335b4a1de6fa40708486 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7f7605b… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 16:26:16 2012 +0100 Revert "Changing to kamcmd" This reverts commit 90432f0e672c5fb11b1e47b9655768bf20e45b89. --- utils/sercmd/EXAMPLES | 42 ++++++++++++++++------------------ utils/sercmd/{kamcmd.8 => sercmd.8} | 0 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/utils/sercmd/EXAMPLES b/utils/sercmd/EXAMPLES index 5278069..079dc6a 100644 --- a/utils/sercmd/EXAMPLES +++ b/utils/sercmd/EXAMPLES @@ -1,61 +1,59 @@ # $id$ -kamcmd usage examples +sercmd usage examples help: - kamcmd -h + sercmd -h -* use an udp kamailio control socket: -===================================== - Kamailio config: +use an udp ser control socket: + ser config: loadmodule "modules/ctl/ctl.so" modparam("ctl", "binrpc", "udp:localhost:2046") modparam("ctl", "binrpc", "tcp:localhost:2046") modparam("ctl", "binrpc", "unixs:/tmp/unix_stream") modparam("ctl", "binrpc", "unixd:/tmp/unix_dgram") - kamcmd: - kamcmd -s udp:localhost:2046 core.version + sercmd: + sercmd -s udp:localhost:2046 core.version use a tcp socket: - kamcmd -s tcp:localhost:2046 core.version + sercmd -s tcp:localhost:2046 core.version use a stream unix socket: - kamcmd -s unixs:/tmp/unix_stream core.version + sercmd -s unixs:/tmp/unix_stream core.version use a datagram unix socket: - kamcmd -s unixd:/tmp/unix_dgram core.version + sercmd -s unixd:/tmp/unix_dgram core.version + -* Command help -============== list available commands on ser side: - kamcmd -s unixd:/tmp/unix_drgam ls + sercmd -s unixd:/tmp/unix_drgam ls -list all available commands (including kamcmd builtins or aliases): - kamcmd -s unixd:/tmp/unix_dgram ? +list all available commands (including sercmd builtins or aliases): + sercmd -s unixd:/tmp/unix_dgram ? or - kamcmd -s unixd:/tmp/unix_dgram help + sercmd -s unixd:/tmp/unix_dgram help get help on one command: - kamcmd -s unixd:/tmp/unix_dgram help core.ps + sercmd -s unixd:/tmp/unix_dgram help core.ps list ser processes: - kamcmd -s unixd:/tmp/unix_dgram ps + sercmd -s unixd:/tmp/unix_dgram ps send an rpc command to ser: - kamcmd -s unixd:/tmp/unix_dgram core.shmmem + sercmd -s unixd:/tmp/unix_dgram core.shmmem format the output: - kamcmd -s unixd:/tmp/unix_dgram -f 'pid:%v desc:"%v"\n' core.ps + sercmd -s unixd:/tmp/unix_dgram -f 'pid:%v desc:"%v"\n' core.ps (note: you could use just ps instead of core.ps) format the output as csv: - kamcmd -s unixd:/tmp/unix_dgram -f '%v,' core.ps + sercmd -s unixd:/tmp/unix_dgram -f '%v,' core.ps enter interactive mode: - kamcmd -s unixd:/tmp/unix_dgram + sercmd -s unixd:/tmp/unix_dgram (note: type help,or ? to see the command list, tab expansion should also work) diff --git a/utils/sercmd/kamcmd.8 b/utils/sercmd/sercmd.8 similarity index 100% rename from utils/sercmd/kamcmd.8 rename to utils/sercmd/sercmd.8

11 years, 4 months

git:master: kamcmd changes

by Olle E. Johansson

Module: sip-router Branch: master Commit: 5c4bb10fc7a534b92b0dcd9c229ea1392da34cee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5c4bb10… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 10:22:56 2012 +0100 kamcmd changes --- utils/README-UTILS | 12 ++++++------ utils/sercmd/kamcmd.8 | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/utils/README-UTILS b/utils/README-UTILS index 3ccd2c4..3027424 100644 --- a/utils/README-UTILS +++ b/utils/README-UTILS @@ -1,13 +1,13 @@ This directory contains various utility programs for SIP-router -db_berkeley ???? +db_berkeley recovery for berkeley_db module db_oracle ???? -fifo_relay ???? -kamctl ???? -kamunix ???? +fifo_relay PHP script to provide network based fifo access +kamctl Script to communicate with Kamailio over the MI interface +kamunix Kamailio UNIX socket wrapper pdbt ???? -pike_top ???? +pike_top SER mod_pike top console profile ???? route_graph ???? -sercmd ???? +kamcmd Software to communicate with Kamailio using the binRPC interface sipgrep ???? diff --git a/utils/sercmd/kamcmd.8 b/utils/sercmd/kamcmd.8 index 843de18..905ef99 100644 --- a/utils/sercmd/kamcmd.8 +++ b/utils/sercmd/kamcmd.8 @@ -1,20 +1,20 @@ .\" $Id$ -.TH sercmd 8 23.10.2012 sip-router "sip-router" +.TH kamcmd 8 23.10.2012 Kamailio "sip-router" .\" Process with -.\" groff -man -Tascii sercmd.8 +.\" groff -man -Tascii kamcmd.8 .\" .SH NAME -sercmd \- sip-router command line tool +kamcmd \- sip-router command line tool .SH SYNOPSIS -.B sercmd +.B kamcmd [ .B \-h ] .SH DESCRIPTION -.B sercmd +.B kamcmd is a command line to interact with -.B sip-router SIP server +.B Kamailio SIP server It can be used to manage users, domains, aliases and other server options. .SH OPTIONS @@ -25,11 +25,11 @@ display a short usage description, including all available options. .SH AUTHORS see -.B /usr/share/doc/sip-router/AUTHORS +.B /usr/share/doc/kamailio/AUTHORS .SH SEE ALSO -.BR sip-router(8), -.BR sip-router.cfg(5) +.BR kamailio(8), +.BR kamailio.cfg(5) .PP Full documentation on sip-router is available at -.I http://www.sip-router.org/. +.I http://www.kamailio.org/.

11 years, 4 months

git:master: kamcmd Updating docs

by Olle E. Johansson

Module: sip-router Branch: master Commit: 9b745fbb0a065cf30b8069e950b4e6e9f2d8b20c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b745fb… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 10:17:36 2012 +0100 kamcmd Updating docs --- utils/sercmd/README | 103 +++++++++++++++++++++++++-------------------------- 1 files changed, 50 insertions(+), 53 deletions(-) diff --git a/utils/sercmd/README b/utils/sercmd/README index 1c9c823..b5005ef 100644 --- a/utils/sercmd/README +++ b/utils/sercmd/README @@ -8,24 +8,23 @@ Overview ======== -sercmd is a unix tool for interfacing with sip-router using ser exported RPCs. +kamcmd is a unix tool for interfacing with Kamailio using exported RPCs. It uses binrpc (a proprietary protocol, designed for minimal packet size and fast parsing) over a variety of transports (unix stream sockets, unix datagram sockets, udp or tcp). For more details on binrpc see the ctl module documentation -(modules_s/ctl/README). +(modules/ctl/README). -sercmd can work in command line mode (the RPC or command name is just another +kamcmd can work in command line mode (the RPC or command name is just another command line parameter) or in interactive mode. The interactive mode supports -history and tab-completion (if sercmd was compiled with libreadline support). - -On ser side the ctl module must be loaded. +history and tab-completion (if kamcmd was compiled with libreadline support). +On Kamailio side the ctl module must be loaded. Usage ===== - sercmd [options][-s address] [ cmd ] + kamcmd [options][-s address] [ cmd ] Options: -s address unix socket name or host name to send the commands on @@ -52,7 +51,7 @@ arg: string or number; to force a number to be interpreted as string prefix it by "s:", e.g. s:1 -If no address is specified (no -s), sercmd will use by default +If no address is specified (no -s), kamcmd will use by default unixs:/tmp/ser_ctl. This is also the default for the ctl module (if no "binrpc" module parameters are present in the config). @@ -60,54 +59,53 @@ unixs:/tmp/ser_ctl. This is also the default for the ctl module (if no Command Types ============= -There are 3 types of commands: "raw" ser RPC, sercmd aliases and sercmd +There are 3 types of commands: "raw" RPC, kamcmd aliases and kamcmd builtins. The "raw" RPC commands work directly with ser with no change on the input or the output. -All the RPCs can be seen using sercmd ls. +To list available RPC commands, use "kamcmd help". -The aliases are just other easier to remember names for some ser RPCs, which -some time include nicer formatting of the rpc result. -One can see all the defined aliases using: sercmd help|grep alias: . +The aliases are just easier to remember names for some RPCs, which +some time include nicer formatting of the RPC result. +One can see all the defined aliases using: kamcmd help|grep alias: . Example: ps is an alias for core.ps with the output formatted in a more readable way. - sercmd ps is equivalent to sercmd -f"%v\t%v\n" core.ps. - Without the formatting, the output of sercmd core.ps looks like: + kamcmd ps is equivalent to kamcmd -f"%v\t%v\n" core.ps. + Without the formatting, the output of kamcmd core.ps looks like: 11262 attendant 11268 udp receiver child=0 sock=127.0.0.1:5060 ... - Using sercmd ps (or sercmd -f"%v\t%v\n" core.ps) the output looks like: + Using kamcmd ps (or kamcmd -f"%v\t%v\n" core.ps) the output looks like: 11262 attendant 11268 udp receiver child=0 sock=127.0.0.1:5060 ... The built-in commands can combine several different rpcs. -One can see all the built-in commands using: sercmd help|grep builtin: . - +One can see all the built-in commands using: kamcmd help|grep builtin: . Getting help on a command ========================= To get the help message associated with a command use -sercmd help <command_name>. +kamcmd help <command_name>. Example: -$ sercmd help ps +$ kamcmd help ps ps is an alias for core.ps with reply formatting: "%v\t%v\n" -$ sercmd help core.ps -Returns the description of running SER processes. +$ kamcmd help core.ps +Returns the description of running Kamailio processes. Listing all the commands ======================== To see all the available commands (ser RPCs, aliases and bultins) use - sercmd help. -To see only the "raw" RPCs, user sercmd ls. + kamcmd help. +To see only the "raw" RPCs, user kamcmd ls. Note: since each module can define its own RPCs, the available RPCs depend on the loaded modules. @@ -117,7 +115,7 @@ Examples Using the default socket (requires only loadmodule "ctl" in ser.cfg): -$ sercmd ps +$ kamcmd ps 11262 attendant 11268 udp receiver child=0 sock=127.0.0.1:5060 11269 udp receiver child=1 sock=127.0.0.1:5060 @@ -130,25 +128,25 @@ $ sercmd ps 11276 tcp receiver child=1 11277 tcp main process -$ sercmd help # list all the supported commands +$ kamcmd help # list all the supported commands dst_blacklist.add ctl.who ... -$ sercmd help core.uptime # help for the core.uptime rpc -Returns uptime of SER server. +$ kamcmd help core.uptime # help for the core.uptime rpc +Returns uptime of the Kamailio server. -$ sercmd cfg.cfg_set_int_now debug 5 # turn debug level to 5 (needs cfg) +$ kamcmd cfg.cfg_set_int_now debug 5 # turn debug level to 5 (needs cfg) -$ sercmd # enters interactive mode +$ kamcmd # enters interactive mode Using a tcp socket -(assumes modparam("ctl", "binrpc", "tcp:localhost:2048") in ser.cfg) +(assumes modparam("ctl", "binrpc", "tcp:localhost:2048") in kamailio.cfg) -$ sercmd -s tcp:localhost:2048 core.version -Server: Sip EXpress router (2.1.0-dev23-make (i386/linux)) +$ kamcmd -s tcp:localhost:2048 core.version +Server: Kamailio (3.3.2 (i386/linux)) -$ sercmd -s tcp:localhost:2048 SRV _sip._udp.iptel.org +$ kamcmd -s tcp:localhost:2048 SRV _sip._udp.iptel.org name: _sip._udp.iptel.org type: SRV size (bytes): 104 @@ -163,33 +161,33 @@ $ sercmd -s tcp:localhost:2048 SRV _sip._udp.iptel.org rr expires in (s): 67693 rr error flags: 0 -sercmd -s tcp:127.0.0.1:2048 # enters interactive mode over tcp +kamcmd -s tcp:127.0.0.1:2048 # enters interactive mode over tcp -For more examples see utils/sercmd/EXAMPLES - [http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/se…]. +For more examples see utils/kamcmd/EXAMPLES + [http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=utils/ka…]. Interactive Mode ================ -To enter the interactive mode start sercmd without specifying a command name +To enter the interactive mode start kamcmd without specifying a command name on the command line. -If sercmd was compiled with libreadline support (automatically if +If kamcmd was compiled with libreadline support (automatically if libreadline dev files are installed), the interactive mode will have tab completion and history support. Example: -$ sercmd -sercmd 0.1 +$ kamcmd +kamcmd 0.2 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. -sercmd> core.s<tab> +kamcmd> core.s<tab> core.sctp_info core.sctp_options core.shmmem -sercmd> help core.shmmem +kamcmd> help core.shmmem Returns shared memory info. -sercmd> core.shmmem +kamcmd> core.shmmem { total: 33554432 free: 33147816 @@ -198,20 +196,19 @@ sercmd> core.shmmem max_used: 406616 fragments: 2 } -sercmd> quit +kamcmd> quit Related Stuff ============= +* ctl module: required, implements binrpc on Kamailio side, without it kamcmd doesn't work. -ctl module: required, implements binrpc on ser side, without it sercmd -doesn't work. -See modules_s/ctl/README +See modules/ctl/README [http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…]. -cfg_rpc module: allows setting or reading configuration parameters on-the-fly. -For example one could change the tcp connection lifetime to 180s using: -$ sercmd cfg.set_now_int tcp.connection_lifetime 180 -See modules_s/cfg_rpc/README - [http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…]. +* cfg_rpc module: allows setting or reading configuration parameters on-the-fly. + For example one could change the tcp connection lifetime to 180s using: + $ kamcmd cfg.set_now_int tcp.connection_lifetime 180 + See modules/cfg_rpc/README + [http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…].

11 years, 4 months

git:master: Change "sercmd" to "kamcmd" in module documentation files - README

by Olle E. Johansson

Module: sip-router Branch: master Commit: 922e7f4a9a56b4c02b5fedb93bd3684b2c410881 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=922e7f4… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 09:31:28 2012 +0100 Change "sercmd" to "kamcmd" in module documentation files - README --- docbook/entities.xml | 2 +- modules/cfg_rpc/README | 14 +- modules/cfg_rpc/doc/cfg_rpc.xml | 4 +- modules/cfg_rpc/doc/rpc.xml | 15 +- modules/corex/README | 4 +- modules/corex/doc/corex_admin.xml | 4 +- modules/debugger/README | 22 ++-- modules/debugger/doc/debugger_admin.xml | 22 ++-- modules/dialplan/README | 8 +- modules/dialplan/doc/dialplan_admin.xml | 6 +- modules/lcr/README | 64 ++++---- modules/lcr/doc/lcr_admin.xml | 8 +- modules/pipelimit/README | 26 ++-- modules/pipelimit/doc/pipelimit_admin.xml | 8 +- modules/ratelimit/README | 18 +- modules/ratelimit/doc/ratelimit_admin.xml | 18 +- modules/sca/README | 230 +++++++++++++------------ modules/sca/doc/sca_admin.xml | 10 +- modules/tm/README | 28 ++-- modules/tm/doc/params.xml | 27 ++- modules_k/dispatcher/README | 40 ++-- modules_k/dispatcher/doc/dispatcher_admin.xml | 8 +- modules_k/domain/README | 8 +- modules_k/domain/doc/domain_admin.xml | 4 +- modules_k/kex/README | 28 ++-- modules_k/kex/doc/kex_admin.xml | 8 +- 26 files changed, 324 insertions(+), 310 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=922…

11 years, 4 months

git:master: kamctl Fix typo that causes the "trusted" help to be printed twice and "address" zero times

by Olle E. Johansson

Module: sip-router Branch: master Commit: 334b6e7a2c0804a7ee4ce30761fc911a31682876 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=334b6e7… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 09:05:50 2012 +0100 kamctl Fix typo that causes the "trusted" help to be printed twice and "address" zero times --- utils/kamctl/kamctl.base | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index dd4635f..db4ef9a 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -435,7 +435,7 @@ cat <<EOF address rm <grp> <ipaddr> ......... remove entries for given grp and ipaddr EOF } -USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_trusted" +USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_address" usage_dispatcher() { echo

11 years, 4 months

git:master: kamctl Change "sercmd" to "kamcmd" in help texts

by Olle E. Johansson

Module: sip-router Branch: master Commit: 3eeaa5af9107f3795aee714ac47380cfb2ef45c3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3eeaa5a… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Dec 23 09:01:01 2012 +0100 kamctl Change "sercmd" to "kamcmd" in help texts --- utils/kamctl/kamctl | 4 ++-- utils/kamctl/kamctl.ser | 6 +++--- utils/kamctl/kamctl.ser_mi | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 3fecd6c..78116be 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -2491,13 +2491,13 @@ case $1 in permissions_address "$@" ;; - fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi) + fifo|mi|unixsock|ser_mi|sercmd_mi|sercmdmi|kamcmd_mi|kamcmdmi) require_ctlengine shift $CTLCMD "$@" ;; - ser|sercmd) + ser|sercmd|kamcmd) require_kamcmd shift $SERCTLCMD "$@" diff --git a/utils/kamctl/kamctl.ser b/utils/kamctl/kamctl.ser index f84c8f0..25f2264 100644 --- a/utils/kamctl/kamctl.ser +++ b/utils/kamctl/kamctl.ser @@ -30,10 +30,10 @@ fi # usage_ser() { echo - mecho " -- command 'sercmd'" + mecho " -- command 'kamcmd'" echo cat <<EOF - sercmd ............................. send command through sercmd + kamcmd ............................. send command through kamcmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser" @@ -44,7 +44,7 @@ ser_cmd() mdbg "entering ser_cmd $*" if [ "$#" -lt 1 ]; then - merr "sercmd must take at least command name as parameter" + merr "kamcmd must take at least command name as parameter" exit 1 fi diff --git a/utils/kamctl/kamctl.ser_mi b/utils/kamctl/kamctl.ser_mi index ebcc61d..13f1117 100644 --- a/utils/kamctl/kamctl.ser_mi +++ b/utils/kamctl/kamctl.ser_mi @@ -30,10 +30,10 @@ fi # usage_ser_mi() { echo - mecho " -- command 'sercmd_mi'" + mecho " -- command 'kamcmd_mi'" echo cat <<EOF - sercmd_mi ............................. send mi command through sercmd + kamcmd_mi ............................. send mi command through kamcmd EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ser_mi" @@ -44,7 +44,7 @@ ser_mi_cmd() mdbg "entering ser_mi_cmd $*" if [ "$#" -lt 1 ]; then - merr "sercmd_mi must take at least command name as parameter" + merr "kamcmd_mi must take at least command name as parameter" exit 1 fi

11 years, 4 months

← Newer
1
...
7
8
9
10
11
12
13
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2012