Properly install appropriate sound files, prefix spy ones with spy- (bug #5192)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6563 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index ac981e7..caca64f 100755 (executable)
--- a/Makefile
+++ b/Makefile
@@ -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 89ee070..f1ae6d2 100755 (executable)
--- 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 a8a1657..0686554 100755 (executable)
--- 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
similarity index 100%
rename from sounds/agent.gsm
rename to sounds/spy-agent.gsm

diff --git a/sounds/h323.gsm b/sounds/spy-h323.gsm
similarity index 100%
rename from sounds/h323.gsm
rename to sounds/spy-h323.gsm

diff --git a/sounds/iax.gsm b/sounds/spy-iax.gsm
similarity index 100%
rename from sounds/iax.gsm
rename to sounds/spy-iax.gsm

diff --git a/sounds/iax2.gsm b/sounds/spy-iax2.gsm
similarity index 100%
rename from sounds/iax2.gsm
rename to sounds/spy-iax2.gsm

diff --git a/sounds/mgcp.gsm b/sounds/spy-mgcp.gsm
similarity index 100%
rename from sounds/mgcp.gsm
rename to sounds/spy-mgcp.gsm

diff --git a/sounds/sip.gsm b/sounds/spy-sip.gsm
similarity index 100%
rename from sounds/sip.gsm
rename to sounds/spy-sip.gsm

diff --git a/sounds/skinny.gsm b/sounds/spy-skinny.gsm
similarity index 100%
rename from sounds/skinny.gsm
rename to sounds/spy-skinny.gsm

diff --git a/sounds/zap.gsm b/sounds/spy-zap.gsm
similarity index 100%
rename from sounds/zap.gsm
rename to sounds/spy-zap.gsm