Module: sip-router Branch: master Commit: 90432f0e672c5fb11b1e47b9655768bf20e45b89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90432f0e...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@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
These changes should not be necessary, because the install renamed the files and updated the content.
Have you tested to see if the install works fine now? I guess it got broken. All the files should stay with the base name as dir name, then the install was made to copy with different name and update the man page content properly.
Daniel
On 12/23/12 10:23 AM, Olle E. Johansson wrote:
Module: sip-router Branch: master Commit: 90432f0e672c5fb11b1e47b9655768bf20e45b89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90432f0e...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@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
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
Daniel-Constantin Mierla writes:
These changes should not be necessary, because the install renamed the files and updated the content.
Have you tested to see if the install works fine now? I guess it got broken. All the files should stay with the base name as dir name, then the install was made to copy with different name and update the man page content properly.
i have had this in my make script:
# Rename kamcmd sed -i -e 's/NAME=kamcmd/NAME=sip-proxy_ctl/' utils/sercmd/Makefile
i hope it still works like it used to:
# sip-proxy_ctl sip-proxy_ctl 0.2 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. sip-proxy_ctl>
if kamcmd cannot anymore renamed by editing utils/sercmd/Makefile like in above, the commits need to be reverted.
-- juha
23 dec 2012 kl. 13:35 skrev Juha Heinanen jh@tutpro.com:
Daniel-Constantin Mierla writes:
These changes should not be necessary, because the install renamed the files and updated the content.
Have you tested to see if the install works fine now? I guess it got broken. All the files should stay with the base name as dir name, then the install was made to copy with different name and update the man page content properly.
i have had this in my make script:
# Rename kamcmd sed -i -e 's/NAME=kamcmd/NAME=sip-proxy_ctl/' utils/sercmd/Makefile
i hope it still works like it used to:
# sip-proxy_ctl sip-proxy_ctl 0.2 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. sip-proxy_ctl>
if kamcmd cannot anymore renamed by editing utils/sercmd/Makefile like in above, the commits need to be reverted.
Reverted.
Now, it's hard for the many of us new to support out-of-repo scripts, so please be gentle when we break stuff that we have no idea that it exists ;-)
/O
On 12/23/12 4:29 PM, Olle E. Johansson wrote:
23 dec 2012 kl. 13:35 skrev Juha Heinanen jh@tutpro.com:
Daniel-Constantin Mierla writes:
These changes should not be necessary, because the install renamed the files and updated the content.
Have you tested to see if the install works fine now? I guess it got broken. All the files should stay with the base name as dir name, then the install was made to copy with different name and update the man page content properly.
i have had this in my make script:
# Rename kamcmd sed -i -e 's/NAME=kamcmd/NAME=sip-proxy_ctl/' utils/sercmd/Makefile
i hope it still works like it used to:
# sip-proxy_ctl sip-proxy_ctl 0.2 Copyright 2006 iptelorg GmbH This is free software with ABSOLUTELY NO WARRANTY. For details type `warranty'. sip-proxy_ctl>
if kamcmd cannot anymore renamed by editing utils/sercmd/Makefile like in above, the commits need to be reverted.
Reverted.
Now, it's hard for the many of us new to support out-of-repo scripts, so please be gentle when we break stuff that we have no idea that it exists ;-)
I would not be worried about private scripts, they have to be adapted by the owners as we develop.
But it is important that things stay coherent inside the source tree (e.g., in this case, names for binary/manpage were 'sercmd', but was no problem to install as 'kamcmd', if the name would be 'kamcmd', it should work to install as 'sercmd'). The default flavour is kamailio, but we don't get rid of the flavouring framework.
Renaming files can impact installation scripts, so this kind of process has to be done carefully.
The files that are not installed, can stay with any name.
Cheers, Daniel
23 dec 2012 kl. 11:36 skrev Daniel-Constantin Mierla miconda@gmail.com:
These changes should not be necessary, because the install renamed the files and updated the content.
Oh, did not find that part.
Have you tested to see if the install works fine now? I guess it got broken. All the files should stay with the base name as dir name, then the install was made to copy with different name and update the man page content properly.
Install works just fine... But I guess that's a reinstall... Many crashes during my work with trying to find out the issues with rpc->scan :-)
Reverted the commit (I hope...) /O
Daniel
On 12/23/12 10:23 AM, Olle E. Johansson wrote:
Module: sip-router Branch: master Commit: 90432f0e672c5fb11b1e47b9655768bf20e45b89 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90432f0e...
Author: Olle E. Johansson oej@edvina.net Committer: Olle E. Johansson oej@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
sr-dev mailing list sr-dev@lists.sip-router.org http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev
-- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda
-
Daniel-Constantin Mierla -
Juha Heinanen -
Olle E. Johansson