diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-12 03:49:54 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-09-12 03:49:54 +0000 |
commit | c05f5017eb8ec624b951d4d9a818029fd9c6cc5d (patch) | |
tree | 8d58e8a83f9e00e96d2b57b5c63febeec03d7e40 | |
parent | 5f39cef2c9fefdc96f35b3b5a421eeafd90ffae5 (diff) |
Properly install appropriate sound files, prefix spy ones with spy- (bug #5192)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@6563 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 2 | ||||
-rwxr-xr-x | apps/app_chanspy.c | 6 | ||||
-rwxr-xr-x | sounds.txt | 16 | ||||
-rwxr-xr-x | sounds/spy-agent.gsm (renamed from sounds/agent.gsm) | bin | 1320 -> 1320 bytes | |||
-rwxr-xr-x | sounds/spy-h323.gsm (renamed from sounds/h323.gsm) | bin | 2706 -> 2706 bytes | |||
-rwxr-xr-x | sounds/spy-iax.gsm (renamed from sounds/iax.gsm) | bin | 957 -> 957 bytes | |||
-rwxr-xr-x | sounds/spy-iax2.gsm (renamed from sounds/iax2.gsm) | bin | 957 -> 957 bytes | |||
-rwxr-xr-x | sounds/spy-mgcp.gsm (renamed from sounds/mgcp.gsm) | bin | 2508 -> 2508 bytes | |||
-rwxr-xr-x | sounds/spy-sip.gsm (renamed from sounds/sip.gsm) | bin | 1254 -> 1254 bytes | |||
-rwxr-xr-x | sounds/spy-skinny.gsm (renamed from sounds/skinny.gsm) | bin | 1320 -> 1320 bytes | |||
-rwxr-xr-x | sounds/spy-zap.gsm (renamed from sounds/zap.gsm) | bin | 1287 -> 1287 bytes |
11 files changed, 12 insertions, 12 deletions
@@ -514,7 +514,7 @@ datafiles: all exit 1; \ fi; \ done - for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-*; do \ + for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-*; do \ if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \ install -m 644 $$x $(DESTDIR)$(ASTVARLIBDIR)/sounds ; \ else \ diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 89ee070eb..f1ae6d2c1 100755 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -514,7 +514,7 @@ static int chanspy_exec(struct ast_channel *chan, void *data) struct localuser *u; struct ast_channel *peer=NULL, *prev=NULL; char name[AST_NAME_STRLEN], - peer_name[AST_NAME_STRLEN], + peer_name[AST_NAME_STRLEN + 5], *args, *ptr = NULL, *options = NULL, @@ -643,8 +643,8 @@ static int chanspy_exec(struct ast_channel *chan, void *data) if (peer && (!bronly || ast_bridged_channel(peer)) && !ast_check_hangup(peer) && !ast_test_flag(peer, AST_FLAG_SPYING)) { int x = 0; - - strncpy(peer_name, peer->name, AST_NAME_STRLEN); + strncpy(peer_name, "spy-", 5); + strncpy(peer_name + strlen(peer_name), peer->name, AST_NAME_STRLEN); ptr = strchr(peer_name, '/'); *ptr = '\0'; ptr++; diff --git a/sounds.txt b/sounds.txt index a8a16571e..06865545a 100755 --- a/sounds.txt +++ b/sounds.txt @@ -710,18 +710,18 @@ %conf-onlyone.gsm%There is currently only one other participant in the conference. -%agent.gsm%Agent +%spy-agent.gsm%Agent -%h323.gsm%H.323 +%spy-h323.gsm%H.323 -%iax.gsm%IAX +%spy-iax.gsm%IAX -%iax2.gsm%IAX (note: does not say "2") +%spy-iax2.gsm%IAX (note: does not say "2") -%mgcp.gsm%MGCP +%spy-mgcp.gsm%MGCP -%sip.gsm%SIP +%spy-sip.gsm%SIP -%skinny.gsm%Skinny +%spy-skinny.gsm%Skinny -%zap.gsm%Zap +%spy-zap.gsm%Zap diff --git a/sounds/agent.gsm b/sounds/spy-agent.gsm Binary files differindex ab065e9c0..ab065e9c0 100755 --- a/sounds/agent.gsm +++ b/sounds/spy-agent.gsm diff --git a/sounds/h323.gsm b/sounds/spy-h323.gsm Binary files differindex 6ba105472..6ba105472 100755 --- a/sounds/h323.gsm +++ b/sounds/spy-h323.gsm diff --git a/sounds/iax.gsm b/sounds/spy-iax.gsm Binary files differindex a84220ee3..a84220ee3 100755 --- a/sounds/iax.gsm +++ b/sounds/spy-iax.gsm diff --git a/sounds/iax2.gsm b/sounds/spy-iax2.gsm Binary files differindex a84220ee3..a84220ee3 100755 --- a/sounds/iax2.gsm +++ b/sounds/spy-iax2.gsm diff --git a/sounds/mgcp.gsm b/sounds/spy-mgcp.gsm Binary files differindex 7a7751258..7a7751258 100755 --- a/sounds/mgcp.gsm +++ b/sounds/spy-mgcp.gsm diff --git a/sounds/sip.gsm b/sounds/spy-sip.gsm Binary files differindex 70750667d..70750667d 100755 --- a/sounds/sip.gsm +++ b/sounds/spy-sip.gsm diff --git a/sounds/skinny.gsm b/sounds/spy-skinny.gsm Binary files differindex 734dd043d..734dd043d 100755 --- a/sounds/skinny.gsm +++ b/sounds/spy-skinny.gsm diff --git a/sounds/zap.gsm b/sounds/spy-zap.gsm Binary files differindex 22d95ed63..22d95ed63 100755 --- a/sounds/zap.gsm +++ b/sounds/spy-zap.gsm |