Convert all release tags to Opsound music-on-hold.

For more details:
http://blogs.digium.com/2009/08/18/asterisk-music-on-hold-changes/



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

.version

@@ -1 +1 @@
-1.2.30.3
+1.2.30

CREDITS

@@ -95,7 +95,7 @@ Leif Madsen, Jared Smith and Jim van Meggelen - the Asterisk book
 	available under a Creative Commons License at http://www.asteriskdocs.org
 
 === HOLD MUSIC ===
-Music provided by www.freeplaymusic.com
+Music provided by www.opsound.org
 
 === OTHER SOURCE CODE IN ASTERISK ===
 

ChangeLog

@@ -1,36 +1,3 @@
-2008-12-01  Tilghman Lesher <tlesher@digium.com>
-
-	* Asterisk 1.2.30.3 released
-
-2008-11-25 21:37 +0000 [r159245]  Tilghman Lesher <tlesher@digium.com>
-
-	* channels/chan_iax2.c: Regression fix for last security fix. Set
-	  the iseqno correctly. (closes issue #13918) Reported by:
-	  ffloimair Patches: 20081119__bug13918.diff.txt uploaded by
-	  Corydon76 (license 14) Tested by: ffloimair
-
-2008-08-09  Tilghman Lesher <tlesher@digium.com>
-
-	* Asterisk 1.2.30.2 released
-
-2008-08-09 15:24 +0000 [r136945]  Tilghman Lesher <tlesher@digium.com>
-
-	* include/asterisk/compat.h, include/asterisk/astobj2.h: Regression
-	  fixes for Solaris
-
-2008-07-25 15:00 +0000 [r133577]  Russell Bryant <russell@digium.com>
-
-	* LICENSE: Fix the IAX2 URI for calling Digium
-
-2008-07-23  Tilghman Lesher <tlesher@digium.com>
-
-	* Asterisk 1.2.30.1 released
-
-2008-07-24 03:46 +0000 [r133360]  Tilghman Lesher <tlesher@digium.com>
-
-	* channels/chan_iax2.c: This part was not correctly patched for
-	  AST-2008-010.
-
 2008-07-22  Russell Bryant <russell@digium.com>
 
 	* Asterisk 1.2.30 released

LICENSE

@@ -58,7 +58,7 @@ contact us:
 +1.877.546.8963 (via telephone in the USA)
 +1.256.428.6000 (via telephone outside the USA)
 +1.256.864.0464 (via FAX inside or outside the USA)
-IAX2/pbx.digium.com (via IAX2)
+IAX2/misery.digium.com/6000 (via IAX2)
 licensing@digium.com (via email)
 
 Digium, Inc.

README.fpm

@@ -1,8 +0,0 @@
-About Hold Music
-================
-Digium has licensed the music included with
-the Asterisk distribution From FreePlayMusic
-for use and distribution with Asterisk.  It
-is licensed ONLY for use as hold music within
-an Asterisk based PBX.
-

README.opsound

@@ -0,0 +1,22 @@
+About Hold Music
+================
+These files were obtained from http://opsound.org, where the authors placed them
+under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
+may be found at http://creativecommons.org.
+
+Credits
+================
+macroform-cold_day - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-robot_dity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+macroform-the_simplicity - Paul Shuler (Macroform)
+paulshuler@gmail.com - http://macroform.bandcamp.com/
+
+manolo_camp-morning_coffee - Manolo Camp
+beatbastard@gmx.net - http://ccmixter.org/people/ManoloCamp
+
+reno_project-system - Reno Project
+renoproject@hotmail.com - http://www.jamendo.com/en/album/23661

channels/chan_iax2.c

@@ -1318,10 +1318,10 @@ static int find_callno(unsigned short callno, unsigned short dcallno, struct soc
 
 		gettimeofday(&now, NULL);
 
-		start = 2 + (rand() % (TRUNK_CALL_START - 1));
+		start = 1 + (rand() % (TRUNK_CALL_START - 1));
 		for (x = start; 1; x++) {
 			if (x == TRUNK_CALL_START) {
-				x = 1;
+				x = 0;
 				continue;
 			}
 
@@ -3102,7 +3102,7 @@ struct parsed_dial_string {
 static int send_apathetic_reply(unsigned short callno, unsigned short dcallno, struct sockaddr_in *sin, int command, int ts, unsigned char seqno)
 {
 	struct ast_iax2_full_hdr f = { .scallno = htons(0x8000 | callno), .dcallno = htons(dcallno),
-		.ts = htonl(ts), .iseqno = seqno, .oseqno = 0, .type = AST_FRAME_IAX,
+		.ts = htonl(ts), .iseqno = seqno, .oseqno = seqno, .type = AST_FRAME_IAX,
 		.csub = compress_subclass(command) };
 
 	return sendto(defaultsockfd, &f, sizeof(f), 0, (struct sockaddr *)sin, sizeof(*sin));
@@ -6842,7 +6842,7 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 		/* Deal with POKE/PONG without allocating a callno */
 		if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_POKE) {
 			/* Reply back with a PONG, but don't care about the result. */
-			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->iseqno + 1);
+			send_apathetic_reply(1, ntohs(fh->scallno), &sin, IAX_COMMAND_PONG, ntohs(fh->ts), fh->oseqno);
 			return 1;
 		} else if (f.frametype == AST_FRAME_IAX && f.subclass == IAX_COMMAND_ACK && dcallno == 1) {
 			/* Ignore */

include/asterisk/astobj2.h

@@ -17,8 +17,6 @@
 #ifndef _ASTERISK_ASTOBJ2_H
 #define _ASTERISK_ASTOBJ2_H
 
-#include "asterisk/compat.h"
-
 /*! \file 
  *
  * \brief Object Model implementing objects and containers.

include/asterisk/compat.h

@@ -54,7 +54,6 @@
 typedef unsigned char	u_int8_t;
 typedef unsigned short	u_int16_t;
 typedef unsigned int	u_int32_t;
-typedef unsigned int	uint;
 #endif
 
 char* strsep(char** str, const char* delims);

sounds/moh/LICENSE

@@ -1,3 +1,7 @@
-Music Provided By www.freeplaymusic.com. These sound files are provided by
-Digium under license from Freeplay Music Corporation for use in conjunction
-with the Asterisk software only.
+About Hold Music
+================
+These files were obtained from http://opsound.org, where the authors placed them
+under the Creative Commons Attribution-Share Alike 2.5 license, a copy of which
+may be found at http://creativecommons.org.
+
+