OpenPKG Specs / changeset

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/asterisk/amd.conf	Mon Apr 27 12:19:05 2009 +0200
     1.3 @@ -0,0 +1,18 @@
     1.4 +;
     1.5 +; Answering Machine Detection Configuration
     1.6 +;
     1.7 +
     1.8 +;[general]
     1.9 +;initial_silence = 2500		; Maximum silence duration before the greeting.
    1.10 +				; If exceeded then MACHINE.
    1.11 +;greeting = 1500			; Maximum length of a greeting. If exceeded then MACHINE.
    1.12 +;after_greeting_silence = 800	; Silence after detecting a greeting.
    1.13 +				; If exceeded then HUMAN
    1.14 +;total_analysis_time = 5000	; Maximum time allowed for the algorithm to decide
    1.15 +				; on a HUMAN or MACHINE
    1.16 +;min_word_length = 100		; Minimum duration of Voice to considered as a word
    1.17 +;between_words_silence = 50	; Minimum duration of silence after a word to consider
    1.18 +				; the audio what follows as a new word
    1.19 +;maximum_number_of_words = 3	; Maximum number of words in the greeting.
    1.20 +				; If exceeded then MACHINE
    1.21 +;silence_threshold = 256

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/asterisk/asterisk.conf	Mon Apr 27 12:19:05 2009 +0200
     2.3 @@ -0,0 +1,78 @@
     2.4 +;;
     2.5 +;;  asterisk.conf -- Asterisk main configuration file
     2.6 +;;
     2.7 +
     2.8 +;[directories]
     2.9 +; Make sure these directories have the right permissions if not
    2.10 +; running Asterisk as root 
    2.11 +
    2.12 +; Where the configuration files (except for this one) are located
    2.13 +;astetcdir => /etc/asterisk
    2.14 +
    2.15 +; Where the Asterisk loadable modules are located
    2.16 +;astmoddir => /usr/lib/asterisk/modules
    2.17 +
    2.18 +; Where additional 'library' elements (scripts, etc.) are located
    2.19 +;astvarlibdir => /var/lib/asterisk
    2.20 +
    2.21 +; Where AGI scripts/programs are located
    2.22 +;astagidir => /var/lib/asterisk/agi-bin
    2.23 +
    2.24 +; Where spool directories are located
    2.25 +; Voicemail, monitor, dictation and other apps will create files here
    2.26 +; and outgoing call files (used with pbx_spool) must be placed here
    2.27 +;astspooldir => /var/spool/asterisk
    2.28 +
    2.29 +; Where the Asterisk process ID (pid) file should be created
    2.30 +;astrundir => /var/run/asterisk
    2.31 +
    2.32 +; Where the Asterisk log files should be created
    2.33 +;astlogdir => /var/log/asterisk
    2.34 +
    2.35 +
    2.36 +;[options]
    2.37 +;Under "options" you can enter configuration options
    2.38 +;that you also can set with command line options
    2.39 +
    2.40 +;verbose = 0					; Verbosity level for logging (-v)
    2.41 +;debug = 3					; Debug: "No" or value (1-4)
    2.42 +;nofork=yes | no					; Background execution disabled (-f)
    2.43 +;alwaysfork=yes | no				; Always background, even with -v or -d (-F)
    2.44 +;console= yes | no				; Console mode (-c)
    2.45 +;highpriority = yes | no				; Execute with high priority (-p)
    2.46 +;initcrypto = yes | no				; Initialize crypto at startup (-i)
    2.47 +;nocolor = yes | no				; Disable ANSI colors (-n)
    2.48 +;dumpcore = yes | no				; Dump core on failure (-g)
    2.49 +;quiet = yes | no				; Run quietly (-q)
    2.50 +;timestamp = yes | no				; Force timestamping in CLI verbose output (-T)
    2.51 +;runuser = asterisk				; User to run asterisk as (-U) NOTE: will require changes to
    2.52 +						; directory and device permissions
    2.53 +;rungroup = asterisk				; Group to run asterisk as (-G)
    2.54 +;internal_timing = yes | no			; Enable internal timing support (-I)
    2.55 +
    2.56 +;These options have no command line equivalent
    2.57 +;cache_record_files = yes | no			; Cache record() files in another directory until completion
    2.58 +;record_cache_dir = <dir>
    2.59 +;transcode_via_sln = yes | no 			; Build transcode paths via SLINEAR
    2.60 +;transmit_silence_during_record = yes | no	; send SLINEAR silence while channel is being recorded
    2.61 +;maxload = 1.0					; The maximum load average we accept calls for
    2.62 +;maxcalls = 255					; The maximum number of concurrent calls you want to allow 
    2.63 +;execincludes = yes | no 			; Allow #exec entries in configuration files
    2.64 +;dontwarn = yes | no				; Don't over-inform the Asterisk sysadm, he's a guru
    2.65 +;systemname = <a_string>				; System name. Used to prefix CDR uniqueid and to fill ${SYSTEMNAME}
    2.66 +;languageprefix = yes | no			; Should language code be last component of sound file name or first?
    2.67 +	       	       				; when off, sound files are searched as <path>/<lang>/<file>
    2.68 +						; when on, sound files are search as <lang>/<path>/<file>
    2.69 +						; (only affects relative paths for sound files)
    2.70 +
    2.71 +;[files]
    2.72 +; Changing the following lines may compromise your security
    2.73 +; Asterisk.ctl is the pipe that is used to connect the remote CLI
    2.74 +; (asterisk -r) to Asterisk. Changing these settings change the
    2.75 +; permissions and ownership of this file. 
    2.76 +; The file is created when Asterisk starts, in the "astrundir" above.
    2.77 +
    2.78 +;astctlpermissions = 0660
    2.79 +;astctlowner = root
    2.80 +;astctlgroup = asterisk
    2.81 +;astctl = asterisk.ctl

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/asterisk/asterisk.patch	Mon Apr 27 12:19:05 2009 +0200
     3.3 @@ -0,0 +1,2265 @@
     3.4 +Index: cdr/cdr_sqlite.c
     3.5 +diff -Nau cdr/cdr_sqlite.c.orig cdr/cdr_sqlite.c
     3.6 +--- cdr/cdr_sqlite.c.orig	2007-06-14 23:50:40.000000000 +0200
     3.7 ++++ cdr/cdr_sqlite.c	2009-04-24 00:30:33.000000000 +0200
     3.8 +@@ -58,7 +58,7 @@
     3.9 + #define DATE_FORMAT "%Y-%m-%d %T"
    3.10 + 
    3.11 + static char *name = "sqlite";
    3.12 +-static sqlite* db = NULL;
    3.13 ++static sqlite3 *db = NULL;
    3.14 + 
    3.15 + AST_MUTEX_DEFINE_STATIC(sqlite_lock);
    3.16 + 
    3.17 +@@ -92,10 +92,10 @@
    3.18 + static int sqlite_log(struct ast_cdr *cdr)
    3.19 + {
    3.20 + 	int res = 0;
    3.21 +-	char *zErr = 0;
    3.22 + 	struct tm tm;
    3.23 + 	time_t t;
    3.24 + 	char startstr[80], answerstr[80], endstr[80];
    3.25 ++    char *cdrsql = 0;
    3.26 + 	int count;
    3.27 + 
    3.28 + 	ast_mutex_lock(&sqlite_lock);
    3.29 +@@ -113,7 +113,7 @@
    3.30 + 	strftime(endstr, sizeof(endstr), DATE_FORMAT, &tm);
    3.31 + 
    3.32 + 	for(count=0; count<5; count++) {
    3.33 +-		res = sqlite_exec_printf(db,
    3.34 ++		cdrsql = sqlite3_mprintf(
    3.35 + 			"INSERT INTO cdr ("
    3.36 + 				"clid,src,dst,dcontext,"
    3.37 + 				"channel,dstchannel,lastapp,lastdata, "
    3.38 +@@ -138,8 +138,7 @@
    3.39 + #				if LOG_USERFIELD
    3.40 + 				",'%q'"
    3.41 + #				endif
    3.42 +-			")", NULL, NULL, &zErr,
    3.43 +-				cdr->clid, cdr->src, cdr->dst, cdr->dcontext,
    3.44 ++			")", cdr->clid, cdr->src, cdr->dst, cdr->dcontext,
    3.45 + 				cdr->channel, cdr->dstchannel, cdr->lastapp, cdr->lastdata,
    3.46 + 				startstr, answerstr, endstr,
    3.47 + 				cdr->duration, cdr->billsec, cdr->disposition, cdr->amaflags,
    3.48 +@@ -151,16 +150,13 @@
    3.49 + 				,cdr->userfield
    3.50 + #				endif
    3.51 + 			);
    3.52 ++			res = sqlite3_exec(db, cdrsql, 0, 0, 0);
    3.53 ++			sqlite3_free(cdrsql);
    3.54 + 		if (res != SQLITE_BUSY && res != SQLITE_LOCKED)
    3.55 + 			break;
    3.56 + 		usleep(200);
    3.57 + 	}
    3.58 + 	
    3.59 +-	if (zErr) {
    3.60 +-		ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
    3.61 +-		free(zErr);
    3.62 +-	}
    3.63 +-
    3.64 + 	ast_mutex_unlock(&sqlite_lock);
    3.65 + 	return res;
    3.66 + }
    3.67 +@@ -168,7 +164,7 @@
    3.68 + static int unload_module(void)
    3.69 + {
    3.70 + 	if (db)
    3.71 +-		sqlite_close(db);
    3.72 ++		sqlite3_close(db);
    3.73 + 	ast_cdr_unregister(name);
    3.74 + 	return 0;
    3.75 + }
    3.76 +@@ -181,17 +177,16 @@
    3.77 + 
    3.78 + 	/* is the database there? */
    3.79 + 	snprintf(fn, sizeof(fn), "%s/cdr.db", ast_config_AST_LOG_DIR);
    3.80 +-	db = sqlite_open(fn, 0660, &zErr);
    3.81 ++	sqlite3_open(fn, &db);
    3.82 + 	if (!db) {
    3.83 +-		ast_log(LOG_ERROR, "cdr_sqlite: %s\n", zErr);
    3.84 +-		free(zErr);
    3.85 ++		ast_log(LOG_ERROR, "cdr_sqlite: %s\n", sqlite3_errmsg(db));
    3.86 + 		return -1;
    3.87 + 	}
    3.88 + 
    3.89 + 	/* is the table there? */
    3.90 +-	res = sqlite_exec(db, "SELECT COUNT(AcctId) FROM cdr;", NULL, NULL, NULL);
    3.91 ++	res = sqlite3_exec(db, "SELECT COUNT(AcctId) FROM cdr;", NULL, NULL, NULL);
    3.92 + 	if (res) {
    3.93 +-		res = sqlite_exec(db, sql_create_table, NULL, NULL, &zErr);
    3.94 ++		res = sqlite3_exec(db, sql_create_table, NULL, NULL, &zErr);
    3.95 + 		if (res) {
    3.96 + 			ast_log(LOG_ERROR, "cdr_sqlite: Unable to create table 'cdr': %s\n", zErr);
    3.97 + 			free(zErr);
    3.98 +@@ -210,7 +205,7 @@
    3.99 + 
   3.100 + err:
   3.101 + 	if (db)
   3.102 +-		sqlite_close(db);
   3.103 ++		sqlite3_close(db);
   3.104 + 	return -1;
   3.105 + }
   3.106 + 
   3.107 +Index: channels/chan_sip.c
   3.108 +diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
   3.109 +--- channels/chan_sip.c.orig	2009-04-02 19:20:22.000000000 +0200
   3.110 ++++ channels/chan_sip.c	2009-04-24 00:30:33.000000000 +0200
   3.111 +@@ -7469,7 +7469,7 @@
   3.112 + 
   3.113 + 	ast_copy_string(from, get_header(&p->initreq, "From"), sizeof(from));
   3.114 + 	c = get_in_brackets(from);
   3.115 +-	if (strncasecmp(c, "sip:", 4)) {
   3.116 ++	if (strncasecmp(c, "sip:", 4) && strncasecmp(c, "sips:", 5)) {
   3.117 + 		ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", c);
   3.118 + 		return -1;
   3.119 + 	}
   3.120 +@@ -7477,7 +7477,7 @@
   3.121 + 
   3.122 + 	ast_copy_string(to, get_header(&p->initreq, "To"), sizeof(to));
   3.123 + 	c = get_in_brackets(to);
   3.124 +-	if (strncasecmp(c, "sip:", 4)) {
   3.125 ++	if (strncasecmp(c, "sip:", 4) && strncasecmp(c, "sips:", 5)) {
   3.126 + 		ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", c);
   3.127 + 		return -1;
   3.128 + 	}
   3.129 +@@ -8004,7 +8004,10 @@
   3.130 + 	of = get_in_brackets(from);
   3.131 + 	ast_string_field_set(p, from, of);
   3.132 + 	if (strncasecmp(of, "sip:", 4))
   3.133 +-		ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
   3.134 ++		if (strncasecmp(of, "sips:", 5))
   3.135 ++			ast_log(LOG_NOTICE, "From address missing 'sip:' or 'sips:', using it anyway\n");
   3.136 ++		else
   3.137 ++			of += 5;
   3.138 + 	else
   3.139 + 		of += 4;
   3.140 + 	/* Get just the username part */
   3.141 +@@ -8280,7 +8283,10 @@
   3.142 + 
   3.143 + 	/* Make sure it's a SIP URL */
   3.144 + 	if (strncasecmp(contact, "sip:", 4)) {
   3.145 +-		ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip:) trying to use anyway\n", contact);
   3.146 ++		if (strncasecmp(contact, "sips:", 5))
   3.147 ++			ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip: or sips:) trying to use anyway\n", contact);
   3.148 ++		else
   3.149 ++			contact += 5;
   3.150 + 	} else
   3.151 + 		contact += 4;
   3.152 + 
   3.153 +@@ -8409,7 +8415,10 @@
   3.154 + 
   3.155 + 	/* Make sure it's a SIP URL */
   3.156 + 	if (strncasecmp(curi, "sip:", 4)) {
   3.157 +-		ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip:) trying to use anyway\n", curi);
   3.158 ++		if (strncasecmp(curi, "sips:", 5))
   3.159 ++			ast_log(LOG_NOTICE, "'%s' is not a valid SIP contact (missing sip: or sips:) trying to use anyway\n", curi);
   3.160 ++		else
   3.161 ++			curi += 5;
   3.162 + 	} else
   3.163 + 		curi += 4;
   3.164 + 	/* Ditch q */
   3.165 +@@ -9000,9 +9009,12 @@
   3.166 + 
   3.167 + 	if (!strncasecmp(c, "sip:", 4)) {
   3.168 + 		name = c + 4;
   3.169 ++	}
   3.170 ++	else if (!strncasecmp(c, "sips:", 5)) {
   3.171 ++		name = c + 5;
   3.172 + 	} else {
   3.173 + 		name = c;
   3.174 +-		ast_log(LOG_NOTICE, "Invalid to address: '%s' from %s (missing sip:) trying to use anyway...\n", c, ast_inet_ntoa(sin->sin_addr));
   3.175 ++		ast_log(LOG_NOTICE, "Invalid to address: '%s' from %s (missing sip: or sips:) trying to use anyway...\n", c, ast_inet_ntoa(sin->sin_addr));
   3.176 + 	}
   3.177 + 
   3.178 + 	/* Strip off the domain name */
   3.179 +@@ -9162,10 +9174,15 @@
   3.180 + 		return 0;
   3.181 + 	c = get_in_brackets(tmp);
   3.182 + 	if (strncasecmp(c, "sip:", 4)) {
   3.183 +-		ast_log(LOG_WARNING, "Huh?  Not an RDNIS SIP header (%s)?\n", c);
   3.184 +-		return -1;
   3.185 ++		if (strncasecmp(c, "sips:", 5)) {
   3.186 ++			ast_log(LOG_WARNING, "Huh?  Not an RDNIS SIP header (%s)?\n", c);
   3.187 ++			return -1;
   3.188 ++		}
   3.189 ++		else
   3.190 ++			c += 5;
   3.191 + 	}
   3.192 +-	c += 4;
   3.193 ++	else
   3.194 ++		c += 4;
   3.195 + 	a = c;
   3.196 + 	strsep(&a, "@;");	/* trim anything after @ or ; */
   3.197 + 	if (sip_debug_test_pvt(p))
   3.198 +@@ -9200,10 +9217,15 @@
   3.199 + 	uri = get_in_brackets(tmp);
   3.200 + 
   3.201 + 	if (strncasecmp(uri, "sip:", 4)) {
   3.202 +-		ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", uri);
   3.203 +-		return -1;
   3.204 ++		if (strncasecmp(uri, "sips:", 5)) {
   3.205 ++			ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", uri);
   3.206 ++			return -1;
   3.207 ++		}
   3.208 ++		else
   3.209 ++			uri += 5;
   3.210 + 	}
   3.211 +-	uri += 4;
   3.212 ++	else
   3.213 ++		uri += 4;
   3.214 + 
   3.215 + 	/* Now find the From: caller ID and name */
   3.216 + 	ast_copy_string(tmpf, get_header(req, "From"), sizeof(tmpf));
   3.217 +@@ -9217,10 +9239,15 @@
   3.218 + 	
   3.219 + 	if (!ast_strlen_zero(from)) {
   3.220 + 		if (strncasecmp(from, "sip:", 4)) {
   3.221 +-			ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", from);
   3.222 +-			return -1;
   3.223 ++			if (strncasecmp(from, "sips:", 5)) {
   3.224 ++				ast_log(LOG_WARNING, "Huh?  Not a SIP header (%s)?\n", from);
   3.225 ++				return -1;
   3.226 ++			}
   3.227 ++			else
   3.228 ++				from += 5;
   3.229 + 		}
   3.230 +-		from += 4;
   3.231 ++		else
   3.232 ++			from += 4;
   3.233 + 		if ((a = strchr(from, '@')))
   3.234 + 			*a++ = '\0';
   3.235 + 		else
   3.236 +@@ -9397,10 +9424,15 @@
   3.237 + 		ast_uri_decode(refer_to);
   3.238 + 
   3.239 + 	if (strncasecmp(refer_to, "sip:", 4)) {
   3.240 +-		ast_log(LOG_WARNING, "Can't transfer to non-sip: URI.  (Refer-to: %s)?\n", refer_to);
   3.241 +-		return -3;
   3.242 ++		if (strncasecmp(refer_to, "sips:", 5)) {
   3.243 ++			ast_log(LOG_WARNING, "Can't transfer to non-sip: URI.  (Refer-to: %s)?\n", refer_to);
   3.244 ++			return -3;
   3.245 ++		}
   3.246 ++		else
   3.247 ++			refer_to += 5;			/* Skip sips: */
   3.248 + 	}
   3.249 +-	refer_to += 4;			/* Skip sip: */
   3.250 ++	else
   3.251 ++		refer_to += 4;			/* Skip sip: */
   3.252 + 
   3.253 + 	/* Get referred by header if it exists */
   3.254 + 	p_referred_by = get_header(req, "Referred-By");
   3.255 +@@ -9417,9 +9449,13 @@
   3.256 + 		}
   3.257 + 
   3.258 + 		referred_by_uri = get_in_brackets(h_referred_by);
   3.259 +-		if(strncasecmp(referred_by_uri, "sip:", 4)) {
   3.260 +-			ast_log(LOG_WARNING, "Huh?  Not a sip: header (Referred-by: %s). Skipping.\n", referred_by_uri);
   3.261 +-			referred_by_uri = (char *) NULL;
   3.262 ++		if (strncasecmp(referred_by_uri, "sip:", 4)) {
   3.263 ++			if (strncasecmp(referred_by_uri, "sips:", 5)) {
   3.264 ++				ast_log(LOG_WARNING, "Huh?  Not a sip: header (Referred-by: %s). Skipping.\n", referred_by_uri);
   3.265 ++				referred_by_uri = (char *) NULL;
   3.266 ++			}
   3.267 ++			else
   3.268 ++				referred_by_uri += 5;		/* Skip sips: */
   3.269 + 		} else {
   3.270 + 			referred_by_uri += 4;		/* Skip sip: */
   3.271 + 		}
   3.272 +@@ -9547,10 +9583,15 @@
   3.273 + 		ast_uri_decode(c);
   3.274 + 	
   3.275 + 	if (strncasecmp(c, "sip:", 4)) {
   3.276 +-		ast_log(LOG_WARNING, "Huh?  Not a SIP header in Also: transfer (%s)?\n", c);
   3.277 +-		return -1;
   3.278 ++		if (strncasecmp(c, "sips:", 5)) {
   3.279 ++			ast_log(LOG_WARNING, "Huh?  Not a SIP header in Also: transfer (%s)?\n", c);
   3.280 ++			return -1;
   3.281 ++		}
   3.282 ++		else
   3.283 ++			c += 5;
   3.284 + 	}
   3.285 +-	c += 4;
   3.286 ++	else
   3.287 ++		c += 4;
   3.288 + 	if ((a = strchr(c, ';'))) 	/* Remove arguments */
   3.289 + 		*a = '\0';
   3.290 + 	
   3.291 +@@ -9761,6 +9802,8 @@
   3.292 + 		t = uri2;
   3.293 + 		if (!strncasecmp(t, "sip:", 4))
   3.294 + 			t+= 4;
   3.295 ++		else if (!strncasecmp(t, "sips:", 5))
   3.296 ++			t+= 5;
   3.297 + 		ast_string_field_set(p, exten, t);
   3.298 + 		t = strchr(p->exten, '@');
   3.299 + 		if (t)
   3.300 +@@ -9771,7 +9814,10 @@
   3.301 + 	/* save the URI part of the From header */
   3.302 + 	ast_string_field_set(p, from, of);
   3.303 + 	if (strncasecmp(of, "sip:", 4)) {
   3.304 +-		ast_log(LOG_NOTICE, "From address missing 'sip:', using it anyway\n");
   3.305 ++		if (strncasecmp(of, "sips:", 5))
   3.306 ++			ast_log(LOG_NOTICE, "From address missing 'sip:' or 'sips:', using it anyway\n");
   3.307 ++		else
   3.308 ++			of += 5;
   3.309 + 	} else
   3.310 + 		of += 4;
   3.311 + 	/* Get just the username part */
   3.312 +@@ -12379,6 +12425,8 @@
   3.313 + 	if (ast_test_flag(&p->flags[0], SIP_PROMISCREDIR)) {
   3.314 + 		if (!strncasecmp(s, "sip:", 4))
   3.315 + 			s += 4;
   3.316 ++		else if (!strncasecmp(s, "sips:", 5))
   3.317 ++			s += 5;
   3.318 + 		e = strchr(s, ';');
   3.319 + 		if (e)
   3.320 + 			*e = '\0';
   3.321 +@@ -12404,6 +12452,8 @@
   3.322 + 	
   3.323 + 		if (!strncasecmp(s, "sip:", 4))
   3.324 + 			s += 4;
   3.325 ++		else if (!strncasecmp(s, "sips:", 5))
   3.326 ++			s += 5;
   3.327 + 		if (option_debug > 1)
   3.328 + 			ast_log(LOG_DEBUG, "Received 302 Redirect to extension '%s' (domain %s)\n", s, domain);
   3.329 + 		if (p->owner) {
   3.330 +Index: codecs/codec_g722.c
   3.331 +diff -Nau codecs/codec_g722.c.orig codecs/codec_g722.c
   3.332 +--- codecs/codec_g722.c.orig	1970-01-01 01:00:00.000000000 +0100
   3.333 ++++ codecs/codec_g722.c	2009-04-24 00:30:33.000000000 +0200
   3.334 +@@ -0,0 +1,306 @@
   3.335 ++/*
   3.336 ++ * Asterisk -- An open source telephony toolkit.
   3.337 ++ *
   3.338 ++ * Copyright (C) 1999 - 2008, Digium, Inc.
   3.339 ++ *
   3.340 ++ * Matthew Fredrickson <creslin@digium.com>
   3.341 ++ * Russell Bryant <russell@digium.com>
   3.342 ++ *
   3.343 ++ * Special thanks to Steve Underwood for the implementation
   3.344 ++ * and for doing the 8khz<->g.722 direct translation code.
   3.345 ++ *
   3.346 ++ * See http://www.asterisk.org for more information about
   3.347 ++ * the Asterisk project. Please do not directly contact
   3.348 ++ * any of the maintainers of this project for assistance;
   3.349 ++ * the project provides a web site, mailing lists and IRC
   3.350 ++ * channels for your use.
   3.351 ++ *
   3.352 ++ * This program is free software, distributed under the terms of
   3.353 ++ * the GNU General Public License Version 2. See the LICENSE file
   3.354 ++ * at the top of the source tree.
   3.355 ++ */
   3.356 ++
   3.357 ++/*! \file
   3.358 ++ *
   3.359 ++ * \brief codec_g722.c - translate between signed linear and ITU G.722-64kbps
   3.360 ++ *
   3.361 ++ * \author Matthew Fredrickson <creslin@digium.com>
   3.362 ++ * \author Russell Bryant <russell@digium.com>
   3.363 ++ *
   3.364 ++ * \arg http://soft-switch.org/downloads/non-gpl-bits.tgz
   3.365 ++ * \arg http://lists.digium.com/pipermail/asterisk-dev/2006-September/022866.html
   3.366 ++ *
   3.367 ++ * \ingroup codecs
   3.368 ++ */
   3.369 ++
   3.370 ++#include "asterisk.h"
   3.371 ++
   3.372 ++ASTERISK_FILE_VERSION(__FILE__, "$Revision: 106501 $")
   3.373 ++
   3.374 ++#include "asterisk/linkedlists.h"
   3.375 ++#include "asterisk/module.h"
   3.376 ++#include "asterisk/config.h"
   3.377 ++#include "asterisk/options.h"
   3.378 ++#include "asterisk/translate.h"
   3.379 ++#include "asterisk/utils.h"
   3.380 ++
   3.381 ++#define BUFFER_SAMPLES   8096	/* size for the translation buffers */
   3.382 ++#define BUF_SHIFT	5
   3.383 ++
   3.384 ++/* Sample frame data */
   3.385 ++
   3.386 ++#include "g722/g722.h"
   3.387 ++#include "slin_g722_ex.h"
   3.388 ++#include "g722_slin_ex.h"
   3.389 ++
   3.390 ++struct g722_encoder_pvt {
   3.391 ++	g722_encode_state_t g722;
   3.392 ++};
   3.393 ++
   3.394 ++struct g722_decoder_pvt {
   3.395 ++	g722_decode_state_t g722;
   3.396 ++};
   3.397 ++
   3.398 ++/*! \brief init a new instance of g722_encoder_pvt. */
   3.399 ++static int lintog722_new(struct ast_trans_pvt *pvt)
   3.400 ++{
   3.401 ++	struct g722_encoder_pvt *tmp = pvt->pvt;
   3.402 ++
   3.403 ++	g722_encode_init(&tmp->g722, 64000, G722_SAMPLE_RATE_8000);
   3.404 ++
   3.405 ++	return 0;
   3.406 ++}
   3.407 ++
   3.408 ++static int lin16tog722_new(struct ast_trans_pvt *pvt)
   3.409 ++{
   3.410 ++	struct g722_encoder_pvt *tmp = pvt->pvt;
   3.411 ++
   3.412 ++	g722_encode_init(&tmp->g722, 64000, 0);
   3.413 ++
   3.414 ++	return 0;
   3.415 ++}
   3.416 ++
   3.417 ++/*! \brief init a new instance of g722_encoder_pvt. */
   3.418 ++static int g722tolin_new(struct ast_trans_pvt *pvt)
   3.419 ++{
   3.420 ++	struct g722_decoder_pvt *tmp = pvt->pvt;
   3.421 ++
   3.422 ++	g722_decode_init(&tmp->g722, 64000, G722_SAMPLE_RATE_8000);
   3.423 ++
   3.424 ++	return 0;
   3.425 ++}
   3.426 ++
   3.427 ++static int g722tolin16_new(struct ast_trans_pvt *pvt)
   3.428 ++{
   3.429 ++	struct g722_decoder_pvt *tmp = pvt->pvt;
   3.430 ++
   3.431 ++	g722_decode_init(&tmp->g722, 64000, 0);
   3.432 ++
   3.433 ++	return 0;
   3.434 ++}
   3.435 ++
   3.436 ++static int g722tolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
   3.437 ++{
   3.438 ++	struct g722_decoder_pvt *tmp = pvt->pvt;
   3.439 ++	int out_samples;
   3.440 ++	int in_samples;
   3.441 ++
   3.442 ++	/* g722_decode expects the samples to be in the invalid samples / 2 format */
   3.443 ++	in_samples = f->samples / 2;
   3.444 ++
   3.445 ++	out_samples = g722_decode(&tmp->g722, (int16_t *) &pvt->outbuf[pvt->samples * sizeof(int16_t)], 
   3.446 ++		(uint8_t *) f->data, in_samples);
   3.447 ++
   3.448 ++	pvt->samples += out_samples;
   3.449 ++
   3.450 ++	pvt->datalen += (out_samples * sizeof(int16_t));
   3.451 ++
   3.452 ++	return 0;
   3.453 ++}
   3.454 ++
   3.455 ++static int lintog722_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
   3.456 ++{
   3.457 ++	struct g722_encoder_pvt *tmp = pvt->pvt;
   3.458 ++	int outlen;
   3.459 ++
   3.460 ++	outlen = g722_encode(&tmp->g722, (uint8_t *) (&pvt->outbuf[pvt->datalen]), 
   3.461 ++		(int16_t *) f->data, f->samples);
   3.462 ++
   3.463 ++	pvt->samples += outlen * 2;
   3.464 ++
   3.465 ++	pvt->datalen += outlen;
   3.466 ++
   3.467 ++	return 0;
   3.468 ++}
   3.469 ++
   3.470 ++static struct ast_frame *g722tolin_sample(void)
   3.471 ++{
   3.472 ++	static struct ast_frame f = {
   3.473 ++		.frametype = AST_FRAME_VOICE,
   3.474 ++		.subclass = AST_FORMAT_G722,
   3.475 ++		.datalen = sizeof(g722_slin_ex),
   3.476 ++		.samples = sizeof(g722_slin_ex) * 2,
   3.477 ++		.src = __PRETTY_FUNCTION__,
   3.478 ++		.data = g722_slin_ex,
   3.479 ++	};
   3.480 ++
   3.481 ++	return &f;
   3.482 ++}
   3.483 ++
   3.484 ++static struct ast_frame *g722tolin16_sample(void)
   3.485 ++{
   3.486 ++	static struct ast_frame f = {
   3.487 ++		.frametype = AST_FRAME_VOICE,
   3.488 ++		.subclass = AST_FORMAT_G722,
   3.489 ++		.datalen = sizeof(slin_g722_ex),
   3.490 ++		.samples = sizeof(slin_g722_ex) * 2,
   3.491 ++		.src = __PRETTY_FUNCTION__,
   3.492 ++		.data = slin_g722_ex,
   3.493 ++	};
   3.494 ++
   3.495 ++	return &f;
   3.496 ++}
   3.497 ++
   3.498 ++static struct ast_frame *lintog722_sample (void)
   3.499 ++{
   3.500 ++	static struct ast_frame f = {
   3.501 ++		.frametype = AST_FRAME_VOICE,
   3.502 ++		.subclass = AST_FORMAT_SLINEAR,
   3.503 ++		.datalen = sizeof(slin_g722_ex),
   3.504 ++		.samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]),
   3.505 ++		.src = __PRETTY_FUNCTION__,
   3.506 ++		.data = slin_g722_ex,
   3.507 ++	};
   3.508 ++
   3.509 ++	return &f;
   3.510 ++}
   3.511 ++
   3.512 ++static struct ast_frame *lin16tog722_sample (void)
   3.513 ++{
   3.514 ++	static struct ast_frame f = {
   3.515 ++		.frametype = AST_FRAME_VOICE,
   3.516 ++		.subclass = AST_FORMAT_SLINEAR16,
   3.517 ++		.datalen = sizeof(slin_g722_ex),
   3.518 ++		.samples = sizeof(slin_g722_ex) / sizeof(slin_g722_ex[0]),
   3.519 ++		.src = __PRETTY_FUNCTION__,
   3.520 ++		.data = slin_g722_ex,
   3.521 ++	};
   3.522 ++
   3.523 ++	return &f;
   3.524 ++}
   3.525 ++
   3.526 ++static struct ast_translator g722tolin = {
   3.527 ++	.name = "g722tolin",
   3.528 ++	.srcfmt = AST_FORMAT_G722,
   3.529 ++	.dstfmt = AST_FORMAT_SLINEAR,
   3.530 ++	.newpvt = g722tolin_new,	/* same for both directions */
   3.531 ++	.framein = g722tolin_framein,
   3.532 ++	.sample = g722tolin_sample,
   3.533 ++	.desc_size = sizeof(struct g722_decoder_pvt),
   3.534 ++	.buffer_samples = BUFFER_SAMPLES / sizeof(int16_t),
   3.535 ++	.buf_size = BUFFER_SAMPLES,
   3.536 ++	.plc_samples = 160,
   3.537 ++};
   3.538 ++
   3.539 ++static struct ast_translator lintog722 = {
   3.540 ++	.name = "lintog722",
   3.541 ++	.srcfmt = AST_FORMAT_SLINEAR,
   3.542 ++	.dstfmt = AST_FORMAT_G722,
   3.543 ++	.newpvt = lintog722_new,	/* same for both directions */
   3.544 ++	.framein = lintog722_framein,
   3.545 ++	.sample = lintog722_sample,
   3.546 ++	.desc_size = sizeof(struct g722_encoder_pvt),
   3.547 ++	.buffer_samples = BUFFER_SAMPLES * 2,
   3.548 ++	.buf_size = BUFFER_SAMPLES,
   3.549 ++};
   3.550 ++
   3.551 ++static struct ast_translator g722tolin16 = {
   3.552 ++	.name = "g722tolin16",
   3.553 ++	.srcfmt = AST_FORMAT_G722,
   3.554 ++	.dstfmt = AST_FORMAT_SLINEAR16,
   3.555 ++	.newpvt = g722tolin16_new,	/* same for both directions */
   3.556 ++	.framein = g722tolin_framein,
   3.557 ++	.sample = g722tolin16_sample,
   3.558 ++	.desc_size = sizeof(struct g722_decoder_pvt),
   3.559 ++	.buffer_samples = BUFFER_SAMPLES / sizeof(int16_t),
   3.560 ++	.buf_size = BUFFER_SAMPLES,
   3.561 ++	.plc_samples = 160,
   3.562 ++};
   3.563 ++
   3.564 ++static struct ast_translator lin16tog722 = {
   3.565 ++	.name = "lin16tog722",
   3.566 ++	.srcfmt = AST_FORMAT_SLINEAR16,
   3.567 ++	.dstfmt = AST_FORMAT_G722,
   3.568 ++	.newpvt = lin16tog722_new,	/* same for both directions */
   3.569 ++	.framein = lintog722_framein,
   3.570 ++	.sample = lin16tog722_sample,
   3.571 ++	.desc_size = sizeof(struct g722_encoder_pvt),
   3.572 ++	.buffer_samples = BUFFER_SAMPLES * 2,
   3.573 ++	.buf_size = BUFFER_SAMPLES,
   3.574 ++};
   3.575 ++
   3.576 ++static int parse_config(int reload)
   3.577 ++{
   3.578 ++	struct ast_variable *var;
   3.579 ++	struct ast_config *cfg = ast_config_load("codecs.conf");
   3.580 ++
   3.581 ++	if (cfg == NULL)
   3.582 ++		return 0;
   3.583 ++	if (cfg == CONFIG_STATUS_FILEUNCHANGED)
   3.584 ++		return 0;
   3.585 ++	for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
   3.586 ++		if (!strcasecmp(var->name, "genericplc")) {
   3.587 ++			g722tolin.useplc = ast_true(var->value) ? 1 : 0;
   3.588 ++			if (option_verbose > 2)
   3.589 ++				ast_verbose(VERBOSE_PREFIX_3 "codec_g722: %susing generic PLC\n",
   3.590 ++					g722tolin.useplc ? "" : "not ");
   3.591 ++		}
   3.592 ++	}
   3.593 ++	ast_config_destroy(cfg);
   3.594 ++	return 0;
   3.595 ++}
   3.596 ++
   3.597 ++static int reload(void)
   3.598 ++{
   3.599 ++	if (parse_config(1))
   3.600 ++		return AST_MODULE_LOAD_DECLINE;
   3.601 ++	return AST_MODULE_LOAD_SUCCESS;
   3.602 ++}
   3.603 ++
   3.604 ++static int unload_module(void)
   3.605 ++{
   3.606 ++	int res = 0;
   3.607 ++
   3.608 ++	res |= ast_unregister_translator(&g722tolin);
   3.609 ++	res |= ast_unregister_translator(&lintog722);
   3.610 ++	res |= ast_unregister_translator(&g722tolin16);
   3.611 ++	res |= ast_unregister_translator(&lin16tog722);
   3.612 ++
   3.613 ++	return res;
   3.614 ++}
   3.615 ++
   3.616 ++static int load_module(void)
   3.617 ++{
   3.618 ++	int res = 0;
   3.619 ++
   3.620 ++	if (parse_config(0))
   3.621 ++		return AST_MODULE_LOAD_DECLINE;
   3.622 ++
   3.623 ++	res |= ast_register_translator(&g722tolin);
   3.624 ++	res |= ast_register_translator(&lintog722);
   3.625 ++	res |= ast_register_translator(&g722tolin16);
   3.626 ++	res |= ast_register_translator(&lin16tog722);
   3.627 ++
   3.628 ++	if (res) {
   3.629 ++		unload_module();
   3.630 ++		return AST_MODULE_LOAD_FAILURE;
   3.631 ++	}	
   3.632 ++
   3.633 ++	return AST_MODULE_LOAD_SUCCESS;
   3.634 ++}
   3.635 ++
   3.636 ++AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ITU G.722-64kbps G722 Transcoder",
   3.637 ++		.load = load_module,
   3.638 ++		.unload = unload_module,
   3.639 ++		.reload = reload,
   3.640 ++	       );
   3.641 +Index: codecs/g722/g722_decode.c
   3.642 +diff -Nau codecs/g722/g722_decode.c.orig codecs/g722/g722_decode.c
   3.643 +--- codecs/g722/g722_decode.c.orig	1970-01-01 01:00:00.000000000 +0100
   3.644 ++++ codecs/g722/g722_decode.c	2009-04-24 00:30:33.000000000 +0200
   3.645 +@@ -0,0 +1,398 @@
   3.646 ++/*
   3.647 ++ * SpanDSP - a series of DSP components for telephony
   3.648 ++ *
   3.649 ++ * g722_decode.c - The ITU G.722 codec, decode part.
   3.650 ++ *
   3.651 ++ * Written by Steve Underwood <steveu@coppice.org>
   3.652 ++ *
   3.653 ++ * Copyright (C) 2005 Steve Underwood
   3.654 ++ *
   3.655 ++ *  Despite my general liking of the GPL, I place my own contributions 
   3.656 ++ *  to this code in the public domain for the benefit of all mankind -
   3.657 ++ *  even the slimy ones who might try to proprietize my work and use it
   3.658 ++ *  to my detriment.
   3.659 ++ *
   3.660 ++ * Based in part on a single channel G.722 codec which is:
   3.661 ++ *
   3.662 ++ * Copyright (c) CMU 1993
   3.663 ++ * Computer Science, Speech Group
   3.664 ++ * Chengxiang Lu and Alex Hauptmann
   3.665 ++ *
   3.666 ++ * $Id: g722_decode.c 48661 2006-12-21 00:08:21Z mattf $
   3.667 ++ */
   3.668 ++
   3.669 ++/*! \file */
   3.670 ++
   3.671 ++#ifdef HAVE_CONFIG_H
   3.672 ++#include <config.h>
   3.673 ++#endif
   3.674 ++
   3.675 ++#include <stdio.h>
   3.676 ++#include <inttypes.h>
   3.677 ++#include <memory.h>
   3.678 ++#include <stdlib.h>
   3.679 ++#if 0
   3.680 ++#include <tgmath.h>
   3.681 ++#endif
   3.682 ++
   3.683 ++#include "g722.h"
   3.684 ++
   3.685 ++#if !defined(FALSE)
   3.686 ++#define FALSE 0
   3.687 ++#endif
   3.688 ++#if !defined(TRUE)
   3.689 ++#define TRUE (!FALSE)
   3.690 ++#endif
   3.691 ++
   3.692 ++static __inline__ int16_t saturate(int32_t amp)
   3.693 ++{
   3.694 ++    int16_t amp16;
   3.695 ++
   3.696 ++    /* Hopefully this is optimised for the common case - not clipping */
   3.697 ++    amp16 = (int16_t) amp;
   3.698 ++    if (amp == amp16)
   3.699 ++        return amp16;
   3.700 ++    if (amp > INT16_MAX)
   3.701 ++        return  INT16_MAX;
   3.702 ++    return  INT16_MIN;
   3.703 ++}
   3.704 ++/*- End of function --------------------------------------------------------*/
   3.705 ++
   3.706 ++static void block4(g722_decode_state_t *s, int band, int d);
   3.707 ++
   3.708 ++static void block4(g722_decode_state_t *s, int band, int d)
   3.709 ++{
   3.710 ++    int wd1;
   3.711 ++    int wd2;
   3.712 ++    int wd3;
   3.713 ++    int i;
   3.714 ++
   3.715 ++    /* Block 4, RECONS */
   3.716 ++    s->band[band].d[0] = d;
   3.717 ++    s->band[band].r[0] = saturate(s->band[band].s + d);
   3.718 ++
   3.719 ++    /* Block 4, PARREC */
   3.720 ++    s->band[band].p[0] = saturate(s->band[band].sz + d);
   3.721 ++
   3.722 ++    /* Block 4, UPPOL2 */
   3.723 ++    for (i = 0;  i < 3;  i++)
   3.724 ++        s->band[band].sg[i] = s->band[band].p[i] >> 15;
   3.725 ++    wd1 = saturate(s->band[band].a[1] << 2);
   3.726 ++
   3.727 ++    wd2 = (s->band[band].sg[0] == s->band[band].sg[1])  ?  -wd1  :  wd1;
   3.728 ++    if (wd2 > 32767)
   3.729 ++        wd2 = 32767;
   3.730 ++    wd3 = (s->band[band].sg[0] == s->band[band].sg[2])  ?  128  :  -128;
   3.731 ++    wd3 += (wd2 >> 7);
   3.732 ++    wd3 += (s->band[band].a[2]*32512) >> 15;
   3.733 ++    if (wd3 > 12288)
   3.734 ++        wd3 = 12288;
   3.735 ++    else if (wd3 < -12288)
   3.736 ++        wd3 = -12288;
   3.737 ++    s->band[band].ap[2] = wd3;
   3.738 ++
   3.739 ++    /* Block 4, UPPOL1 */
   3.740 ++    s->band[band].sg[0] = s->band[band].p[0] >> 15;
   3.741 ++    s->band[band].sg[1] = s->band[band].p[1] >> 15;
   3.742 ++    wd1 = (s->band[band].sg[0] == s->band[band].sg[1])  ?  192  :  -192;
   3.743 ++    wd2 = (s->band[band].a[1]*32640) >> 15;
   3.744 ++
   3.745 ++    s->band[band].ap[1] = saturate(wd1 + wd2);
   3.746 ++    wd3 = saturate(15360 - s->band[band].ap[2]);
   3.747 ++    if (s->band[band].ap[1] > wd3)
   3.748 ++        s->band[band].ap[1] = wd3;
   3.749 ++    else if (s->band[band].ap[1] < -wd3)
   3.750 ++        s->band[band].ap[1] = -wd3;
   3.751 ++
   3.752 ++    /* Block 4, UPZERO */
   3.753 ++    wd1 = (d == 0)  ?  0  :  128;
   3.754 ++    s->band[band].sg[0] = d >> 15;
   3.755 ++    for (i = 1;  i < 7;  i++)
   3.756 ++    {
   3.757 ++        s->band[band].sg[i] = s->band[band].d[i] >> 15;
   3.758 ++        wd2 = (s->band[band].sg[i] == s->band[band].sg[0])  ?  wd1  :  -wd1;
   3.759 ++        wd3 = (s->band[band].b[i]*32640) >> 15;
   3.760 ++        s->band[band].bp[i] = saturate(wd2 + wd3);
   3.761 ++    }
   3.762 ++
   3.763 ++    /* Block 4, DELAYA */
   3.764 ++    for (i = 6;  i > 0;  i--)
   3.765 ++    {
   3.766 ++        s->band[band].d[i] = s->band[band].d[i - 1];
   3.767 ++        s->band[band].b[i] = s->band[band].bp[i];
   3.768 ++    }
   3.769 ++    
   3.770 ++    for (i = 2;  i > 0;  i--)
   3.771 ++    {
   3.772 ++        s->band[band].r[i] = s->band[band].r[i - 1];
   3.773 ++        s->band[band].p[i] = s->band[band].p[i - 1];
   3.774 ++        s->band[band].a[i] = s->band[band].ap[i];
   3.775 ++    }
   3.776 ++
   3.777 ++    /* Block 4, FILTEP */
   3.778 ++    wd1 = saturate(s->band[band].r[1] + s->band[band].r[1]);
   3.779 ++    wd1 = (s->band[band].a[1]*wd1) >> 15;
   3.780 ++    wd2 = saturate(s->band[band].r[2] + s->band[band].r[2]);
   3.781 ++    wd2 = (s->band[band].a[2]*wd2) >> 15;
   3.782 ++    s->band[band].sp = saturate(wd1 + wd2);
   3.783 ++
   3.784 ++    /* Block 4, FILTEZ */
   3.785 ++    s->band[band].sz = 0;
   3.786 ++    for (i = 6;  i > 0;  i--)
   3.787 ++    {
   3.788 ++        wd1 = saturate(s->band[band].d[i] + s->band[band].d[i]);
   3.789 ++        s->band[band].sz += (s->band[band].b[i]*wd1) >> 15;
   3.790 ++    }
   3.791 ++    s->band[band].sz = saturate(s->band[band].sz);
   3.792 ++
   3.793 ++    /* Block 4, PREDIC */
   3.794 ++    s->band[band].s = saturate(s->band[band].sp + s->band[band].sz);
   3.795 ++}
   3.796 ++/*- End of function --------------------------------------------------------*/
   3.797 ++
   3.798 ++g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options)
   3.799 ++{
   3.800 ++    if (s == NULL)
   3.801 ++    {
   3.802 ++        if ((s = (g722_decode_state_t *) malloc(sizeof(*s))) == NULL)
   3.803 ++            return NULL;
   3.804 ++    }
   3.805 ++    memset(s, 0, sizeof(*s));
   3.806 ++    if (rate == 48000)
   3.807 ++        s->bits_per_sample = 6;
   3.808 ++    else if (rate == 56000)
   3.809 ++        s->bits_per_sample = 7;
   3.810 ++    else
   3.811 ++        s->bits_per_sample = 8;
   3.812 ++    if ((options & G722_SAMPLE_RATE_8000))
   3.813 ++        s->eight_k = TRUE;
   3.814 ++    if ((options & G722_PACKED)  &&  s->bits_per_sample != 8)
   3.815 ++        s->packed = TRUE;
   3.816 ++    else
   3.817 ++        s->packed = FALSE;
   3.818 ++    s->band[0].det = 32;
   3.819 ++    s->band[1].det = 8;
   3.820 ++    return s;
   3.821 ++}
   3.822 ++/*- End of function --------------------------------------------------------*/
   3.823 ++
   3.824 ++int g722_decode_release(g722_decode_state_t *s)
   3.825 ++{
   3.826 ++    free(s);
   3.827 ++    return 0;
   3.828 ++}
   3.829 ++/*- End of function --------------------------------------------------------*/
   3.830 ++
   3.831 ++int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[], int len)
   3.832 ++{
   3.833 ++    static const int wl[8] = {-60, -30, 58, 172, 334, 538, 1198, 3042 };
   3.834 ++    static const int rl42[16] = {0, 7, 6, 5, 4, 3, 2, 1, 7, 6, 5, 4, 3,  2, 1, 0 };
   3.835 ++    static const int ilb[32] =
   3.836 ++    {
   3.837 ++        2048, 2093, 2139, 2186, 2233, 2282, 2332,
   3.838 ++        2383, 2435, 2489, 2543, 2599, 2656, 2714,
   3.839 ++        2774, 2834, 2896, 2960, 3025, 3091, 3158,
   3.840 ++        3228, 3298, 3371, 3444, 3520, 3597, 3676,
   3.841 ++        3756, 3838, 3922, 4008
   3.842 ++    };
   3.843 ++    static const int wh[3] = {0, -214, 798};
   3.844 ++    static const int rh2[4] = {2, 1, 2, 1};
   3.845 ++    static const int qm2[4] = {-7408, -1616,  7408,   1616};
   3.846 ++    static const int qm4[16] = 
   3.847 ++    {
   3.848 ++              0, -20456, -12896,  -8968, 
   3.849 ++          -6288,  -4240,  -2584,  -1200,
   3.850 ++          20456,  12896,   8968,   6288,
   3.851 ++           4240,   2584,   1200,      0
   3.852 ++    };
   3.853 ++    static const int qm5[32] =
   3.854 ++    {
   3.855 ++           -280,   -280, -23352, -17560,
   3.856 ++         -14120, -11664,  -9752,  -8184,
   3.857 ++          -6864,  -5712,  -4696,  -3784,
   3.858 ++          -2960,  -2208,  -1520,   -880,
   3.859 ++          23352,  17560,  14120,  11664,
   3.860 ++           9752,   8184,   6864,   5712,
   3.861 ++           4696,   3784,   2960,   2208,
   3.862 ++           1520,    880,    280,   -280
   3.863 ++    };
   3.864 ++    static const int qm6[64] =
   3.865 ++    {
   3.866 ++           -136,   -136,   -136,   -136,
   3.867 ++         -24808, -21904, -19008, -16704,
   3.868 ++         -14984, -13512, -12280, -11192,
   3.869 ++         -10232,  -9360,  -8576,  -7856,
   3.870 ++          -7192,  -6576,  -6000,  -5456,
   3.871 ++          -4944,  -4464,  -4008,  -3576,
   3.872 ++          -3168,  -2776,  -2400,  -2032,
   3.873 ++          -1688,  -1360,  -1040,   -728,
   3.874 ++          24808,  21904,  19008,  16704,
   3.875 ++          14984,  13512,  12280,  11192,
   3.876 ++          10232,   9360,   8576,   7856,
   3.877 ++           7192,   6576,   6000,   5456,
   3.878 ++           4944,   4464,   4008,   3576,
   3.879 ++           3168,   2776,   2400,   2032,
   3.880 ++           1688,   1360,   1040,    728,
   3.881 ++            432,    136,   -432,   -136
   3.882 ++    };
   3.883 ++    static const int qmf_coeffs[12] =
   3.884 ++    {
   3.885 ++           3,  -11,   12,   32, -210,  951, 3876, -805,  362, -156,   53,  -11,
   3.886 ++    };
   3.887 ++
   3.888 ++    int dlowt;
   3.889 ++    int rlow;
   3.890 ++    int ihigh;
   3.891 ++    int dhigh;
   3.892 ++    int rhigh;
   3.893 ++    int xout1;
   3.894 ++    int xout2;
   3.895 ++    int wd1;
   3.896 ++    int wd2;
   3.897 ++    int wd3;
   3.898 ++    int code;
   3.899 ++    int outlen;
   3.900 ++    int i;
   3.901 ++    int j;
   3.902 ++
   3.903 ++    outlen = 0;
   3.904 ++    rhigh = 0;
   3.905 ++    for (j = 0;  j < len;  )
   3.906 ++    {
   3.907 ++        if (s->packed)
   3.908 ++        {
   3.909 ++            /* Unpack the code bits */
   3.910 ++            if (s->in_bits < s->bits_per_sample)
   3.911 ++            {
   3.912 ++                s->in_buffer |= (g722_data[j++] << s->in_bits);
   3.913 ++                s->in_bits += 8;
   3.914 ++            }
   3.915 ++            code = s->in_buffer & ((1 << s->bits_per_sample) - 1);
   3.916 ++            s->in_buffer >>= s->bits_per_sample;
   3.917 ++            s->in_bits -= s->bits_per_sample;
   3.918 ++        }
   3.919 ++        else
   3.920 ++        {
   3.921 ++            code = g722_data[j++];
   3.922 ++        }
   3.923 ++
   3.924 ++        switch (s->bits_per_sample)
   3.925 ++        {
   3.926 ++        default:
   3.927 ++        case 8:
   3.928 ++            wd1 = code & 0x3F;
   3.929 ++            ihigh = (code >> 6) & 0x03;
   3.930 ++            wd2 = qm6[wd1];
   3.931 ++            wd1 >>= 2;
   3.932 ++            break;
   3.933 ++        case 7:
   3.934 ++            wd1 = code & 0x1F;
   3.935 ++            ihigh = (code >> 5) & 0x03;
   3.936 ++            wd2 = qm5[wd1];
   3.937 ++            wd1 >>= 1;
   3.938 ++            break;
   3.939 ++        case 6:
   3.940 ++            wd1 = code & 0x0F;
   3.941 ++            ihigh = (code >> 4) & 0x03;
   3.942 ++            wd2 = qm4[wd1];
   3.943 ++            break;
   3.944 ++        }
   3.945 ++        /* Block 5L, LOW BAND INVQBL */
   3.946 ++        wd2 = (s->band[0].det*wd2) >> 15;
   3.947 ++        /* Block 5L, RECONS */
   3.948 ++        rlow = s->band[0].s + wd2;
   3.949 ++        /* Block 6L, LIMIT */
   3.950 ++        if (rlow > 16383)
   3.951 ++            rlow = 16383;
   3.952 ++        else if (rlow < -16384)
   3.953 ++            rlow = -16384;
   3.954 ++
   3.955 ++        /* Block 2L, INVQAL */
   3.956 ++        wd2 = qm4[wd1];
   3.957 ++        dlowt = (s->band[0].det*wd2) >> 15;
   3.958 ++
   3.959 ++        /* Block 3L, LOGSCL */
   3.960 ++        wd2 = rl42[wd1];
   3.961 ++        wd1 = (s->band[0].nb*127) >> 7;
   3.962 ++        wd1 += wl[wd2];
   3.963 ++        if (wd1 < 0)
   3.964 ++            wd1 = 0;
   3.965 ++        else if (wd1 > 18432)
   3.966 ++            wd1 = 18432;
   3.967 ++        s->band[0].nb = wd1;
   3.968 ++            
   3.969 ++        /* Block 3L, SCALEL */
   3.970 ++        wd1 = (s->band[0].nb >> 6) & 31;
   3.971 ++        wd2 = 8 - (s->band[0].nb >> 11);
   3.972 ++        wd3 = (wd2 < 0)  ?  (ilb[wd1] << -wd2)  :  (ilb[wd1] >> wd2);
   3.973 ++        s->band[0].det = wd3 << 2;
   3.974 ++
   3.975 ++        block4(s, 0, dlowt);
   3.976 ++        
   3.977 ++        if (!s->eight_k)
   3.978 ++        {
   3.979 ++            /* Block 2H, INVQAH */
   3.980 ++            wd2 = qm2[ihigh];
   3.981 ++            dhigh = (s->band[1].det*wd2) >> 15;
   3.982 ++            /* Block 5H, RECONS */
   3.983 ++            rhigh = dhigh + s->band[1].s;
   3.984 ++            /* Block 6H, LIMIT */
   3.985 ++            if (rhigh > 16383)
   3.986 ++                rhigh = 16383;
   3.987 ++            else if (rhigh < -16384)
   3.988 ++                rhigh = -16384;
   3.989 ++
   3.990 ++            /* Block 2H, INVQAH */
   3.991 ++            wd2 = rh2[ihigh];
   3.992 ++            wd1 = (s->band[1].nb*127) >> 7;
   3.993 ++            wd1 += wh[wd2];
   3.994 ++            if (wd1 < 0)
   3.995 ++                wd1 = 0;
   3.996 ++            else if (wd1 > 22528)
   3.997 ++                wd1 = 22528;
   3.998 ++            s->band[1].nb = wd1;
   3.999 ++            
  3.1000 ++            /* Block 3H, SCALEH */
  3.1001 ++            wd1 = (s->band[1].nb >> 6) & 31;
  3.1002 ++            wd2 = 10 - (s->band[1].nb >> 11);
  3.1003 ++            wd3 = (wd2 < 0)  ?  (ilb[wd1] << -wd2)  :  (ilb[wd1] >> wd2);
  3.1004 ++            s->band[1].det = wd3 << 2;
  3.1005 ++
  3.1006 ++            block4(s, 1, dhigh);
  3.1007 ++        }
  3.1008 ++
  3.1009 ++        if (s->itu_test_mode)
  3.1010 ++        {
  3.1011 ++            amp[outlen++] = (int16_t) (rlow << 1);
  3.1012 ++            amp[outlen++] = (int16_t) (rhigh << 1);
  3.1013 ++        }
  3.1014 ++        else
  3.1015 ++        {
  3.1016 ++            if (s->eight_k)
  3.1017 ++            {
  3.1018 ++                amp[outlen++] = (int16_t) rlow;
  3.1019 ++            }
  3.1020 ++            else
  3.1021 ++            {
  3.1022 ++                /* Apply the receive QMF */
  3.1023 ++                for (i = 0;  i < 22;  i++)
  3.1024 ++                    s->x[i] = s->x[i + 2];
  3.1025 ++                s->x[22] = rlow + rhigh;
  3.1026 ++                s->x[23] = rlow - rhigh;
  3.1027 ++
  3.1028 ++                xout1 = 0;
  3.1029 ++                xout2 = 0;
  3.1030 ++                for (i = 0;  i < 12;  i++)
  3.1031 ++                {
  3.1032 ++                    xout2 += s->x[2*i]*qmf_coeffs[i];
  3.1033 ++                    xout1 += s->x[2*i + 1]*qmf_coeffs[11 - i];
  3.1034 ++                }
  3.1035 ++                amp[outlen++] = (int16_t) (xout1 >> 12);
  3.1036 ++                amp[outlen++] = (int16_t) (xout2 >> 12);
  3.1037 ++            }
  3.1038 ++        }
  3.1039 ++    }
  3.1040 ++    return outlen;
  3.1041 ++}
  3.1042 ++/*- End of function --------------------------------------------------------*/
  3.1043 ++/*- End of file ------------------------------------------------------------*/
  3.1044 +Index: codecs/g722/g722_encode.c
  3.1045 +diff -Nau codecs/g722/g722_encode.c.orig codecs/g722/g722_encode.c
  3.1046 +--- codecs/g722/g722_encode.c.orig	1970-01-01 01:00:00.000000000 +0100
  3.1047 ++++ codecs/g722/g722_encode.c	2009-04-24 00:30:33.000000000 +0200
  3.1048 +@@ -0,0 +1,400 @@
  3.1049 ++/*
  3.1050 ++ * SpanDSP - a series of DSP components for telephony
  3.1051 ++ *
  3.1052 ++ * g722_encode.c - The ITU G.722 codec, encode part.
  3.1053 ++ *
  3.1054 ++ * Written by Steve Underwood <steveu@coppice.org>
  3.1055 ++ *
  3.1056 ++ * Copyright (C) 2005 Steve Underwood
  3.1057 ++ *
  3.1058 ++ * All rights reserved.
  3.1059 ++ *
  3.1060 ++ *  Despite my general liking of the GPL, I place my own contributions 
  3.1061 ++ *  to this code in the public domain for the benefit of all mankind -
  3.1062 ++ *  even the slimy ones who might try to proprietize my work and use it
  3.1063 ++ *  to my detriment.
  3.1064 ++ *
  3.1065 ++ * Based on a single channel 64kbps only G.722 codec which is:
  3.1066 ++ *
  3.1067 ++ *****    Copyright (c) CMU    1993      *****
  3.1068 ++ * Computer Science, Speech Group
  3.1069 ++ * Chengxiang Lu and Alex Hauptmann
  3.1070 ++ *
  3.1071 ++ * $Id: g722_encode.c 48661 2006-12-21 00:08:21Z mattf $
  3.1072 ++ */
  3.1073 ++
  3.1074 ++/*! \file */
  3.1075 ++
  3.1076 ++#ifdef HAVE_CONFIG_H
  3.1077 ++#include <config.h>
  3.1078 ++#endif
  3.1079 ++
  3.1080 ++#include <stdio.h>
  3.1081 ++#include <inttypes.h>
  3.1082 ++#include <memory.h>
  3.1083 ++#include <stdlib.h>
  3.1084 ++#if 0
  3.1085 ++#include <tgmath.h>
  3.1086 ++#endif
  3.1087 ++
  3.1088 ++#include "g722.h"
  3.1089 ++
  3.1090 ++#if !defined(FALSE)
  3.1091 ++#define FALSE 0
  3.1092 ++#endif
  3.1093 ++#if !defined(TRUE)
  3.1094 ++#define TRUE (!FALSE)
  3.1095 ++#endif
  3.1096 ++
  3.1097 ++static __inline__ int16_t saturate(int32_t amp)
  3.1098 ++{
  3.1099 ++    int16_t amp16;
  3.1100 ++
  3.1101 ++    /* Hopefully this is optimised for the common case - not clipping */
  3.1102 ++    amp16 = (int16_t) amp;
  3.1103 ++    if (amp == amp16)
  3.1104 ++        return amp16;
  3.1105 ++    if (amp > INT16_MAX)
  3.1106 ++        return  INT16_MAX;
  3.1107 ++    return  INT16_MIN;
  3.1108 ++}
  3.1109 ++/*- End of function --------------------------------------------------------*/
  3.1110 ++
  3.1111 ++static void block4(g722_encode_state_t *s, int band, int d)
  3.1112 ++{
  3.1113 ++    int wd1;
  3.1114 ++    int wd2;
  3.1115 ++    int wd3;
  3.1116 ++    int i;
  3.1117 ++
  3.1118 ++    /* Block 4, RECONS */
  3.1119 ++    s->band[band].d[0] = d;
  3.1120 ++    s->band[band].r[0] = saturate(s->band[band].s + d);
  3.1121 ++
  3.1122 ++    /* Block 4, PARREC */
  3.1123 ++    s->band[band].p[0] = saturate(s->band[band].sz + d);
  3.1124 ++
  3.1125 ++    /* Block 4, UPPOL2 */
  3.1126 ++    for (i = 0;  i < 3;  i++)
  3.1127 ++        s->band[band].sg[i] = s->band[band].p[i] >> 15;
  3.1128 ++    wd1 = saturate(s->band[band].a[1] << 2);
  3.1129 ++
  3.1130 ++    wd2 = (s->band[band].sg[0] == s->band[band].sg[1])  ?  -wd1  :  wd1;
  3.1131 ++    if (wd2 > 32767)
  3.1132 ++        wd2 = 32767;
  3.1133 ++    wd3 = (wd2 >> 7) + ((s->band[band].sg[0] == s->band[band].sg[2])  ?  128  :  -128);
  3.1134 ++    wd3 += (s->band[band].a[2]*32512) >> 15;
  3.1135 ++    if (wd3 > 12288)
  3.1136 ++        wd3 = 12288;
  3.1137 ++    else if (wd3 < -12288)
  3.1138 ++        wd3 = -12288;
  3.1139 ++    s->band[band].ap[2] = wd3;
  3.1140 ++
  3.1141 ++    /* Block 4, UPPOL1 */
  3.1142 ++    s->band[band].sg[0] = s->band[band].p[0] >> 15;
  3.1143 ++    s->band[band].sg[1] = s->band[band].p[1] >> 15;
  3.1144 ++    wd1 = (s->band[band].sg[0] == s->band[band].sg[1])  ?  192  :  -192;
  3.1145 ++    wd2 = (s->band[band].a[1]*32640) >> 15;
  3.1146 ++
  3.1147 ++    s->band[band].ap[1] = saturate(wd1 + wd2);
  3.1148 ++    wd3 = saturate(15360 - s->band[band].ap[2]);
  3.1149 ++    if (s->band[band].ap[1] > wd3)
  3.1150 ++        s->band[band].ap[1] = wd3;
  3.1151 ++    else if (s->band[band].ap[1] < -wd3)
  3.1152 ++        s->band[band].ap[1] = -wd3;
  3.1153 ++
  3.1154 ++    /* Block 4, UPZERO */
  3.1155 ++    wd1 = (d == 0)  ?  0  :  128;
  3.1156 ++    s->band[band].sg[0] = d >> 15;
  3.1157 ++    for (i = 1;  i < 7;  i++)
  3.1158 ++    {
  3.1159 ++        s->band[band].sg[i] = s->band[band].d[i] >> 15;
  3.1160 ++        wd2 = (s->band[band].sg[i] == s->band[band].sg[0])  ?  wd1  :  -wd1;
  3.1161 ++        wd3 = (s->band[band].b[i]*32640) >> 15;
  3.1162 ++        s->band[band].bp[i] = saturate(wd2 + wd3);
  3.1163 ++    }
  3.1164 ++
  3.1165 ++    /* Block 4, DELAYA */
  3.1166 ++    for (i = 6;  i > 0;  i--)
  3.1167 ++    {
  3.1168 ++        s->band[band].d[i] = s->band[band].d[i - 1];
  3.1169 ++        s->band[band].b[i] = s->band[band].bp[i];
  3.1170 ++    }
  3.1171 ++    
  3.1172 ++    for (i = 2;  i > 0;  i--)
  3.1173 ++    {
  3.1174 ++        s->band[band].r[i] = s->band[band].r[i - 1];
  3.1175 ++        s->band[band].p[i] = s->band[band].p[i - 1];
  3.1176 ++        s->band[band].a[i] = s->band[band].ap[i];
  3.1177 ++    }
  3.1178 ++
  3.1179 ++    /* Block 4, FILTEP */
  3.1180 ++    wd1 = saturate(s->band[band].r[1] + s->band[band].r[1]);
  3.1181 ++    wd1 = (s->band[band].a[1]*wd1) >> 15;
  3.1182 ++    wd2 = saturate(s->band[band].r[2] + s->band[band].r[2]);
  3.1183 ++    wd2 = (s->band[band].a[2]*wd2) >> 15;
  3.1184 ++    s->band[band].sp = saturate(wd1 + wd2);
  3.1185 ++
  3.1186 ++    /* Block 4, FILTEZ */
  3.1187 ++    s->band[band].sz = 0;
  3.1188 ++    for (i = 6;  i > 0;  i--)
  3.1189 ++    {
  3.1190 ++        wd1 = saturate(s->band[band].d[i] + s->band[band].d[i]);
  3.1191 ++        s->band[band].sz += (s->band[band].b[i]*wd1) >> 15;
  3.1192 ++    }
  3.1193 ++    s->band[band].sz = saturate(s->band[band].sz);
  3.1194 ++
  3.1195 ++    /* Block 4, PREDIC */
  3.1196 ++    s->band[band].s = saturate(s->band[band].sp + s->band[band].sz);
  3.1197 ++}
  3.1198 ++/*- End of function --------------------------------------------------------*/
  3.1199 ++
  3.1200 ++g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int options)
  3.1201 ++{
  3.1202 ++    if (s == NULL)
  3.1203 ++    {
  3.1204 ++        if ((s = (g722_encode_state_t *) malloc(sizeof(*s))) == NULL)
  3.1205 ++            return NULL;
  3.1206 ++    }
  3.1207 ++    memset(s, 0, sizeof(*s));
  3.1208 ++    if (rate == 48000)
  3.1209 ++        s->bits_per_sample = 6;
  3.1210 ++    else if (rate == 56000)
  3.1211 ++        s->bits_per_sample = 7;
  3.1212 ++    else
  3.1213 ++        s->bits_per_sample = 8;
  3.1214 ++    if ((options & G722_SAMPLE_RATE_8000))
  3.1215 ++        s->eight_k = TRUE;
  3.1216 ++    if ((options & G722_PACKED)  &&  s->bits_per_sample != 8)
  3.1217 ++        s->packed = TRUE;
  3.1218 ++    else
  3.1219 ++        s->packed = FALSE;
  3.1220 ++    s->band[0].det = 32;
  3.1221 ++    s->band[1].det = 8;
  3.1222 ++    return s;
  3.1223 ++}
  3.1224 ++/*- End of function --------------------------------------------------------*/
  3.1225 ++
  3.1226 ++int g722_encode_release(g722_encode_state_t *s)
  3.1227 ++{
  3.1228 ++    free(s);
  3.1229 ++    return 0;
  3.1230 ++}
  3.1231 ++/*- End of function --------------------------------------------------------*/
  3.1232 ++
  3.1233 ++int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[], int len)
  3.1234 ++{
  3.1235 ++    static const int q6[32] =
  3.1236 ++    {
  3.1237 ++           0,   35,   72,  110,  150,  190,  233,  276,
  3.1238 ++         323,  370,  422,  473,  530,  587,  650,  714,
  3.1239 ++         786,  858,  940, 1023, 1121, 1219, 1339, 1458,
  3.1240 ++        1612, 1765, 1980, 2195, 2557, 2919,    0,    0
  3.1241 ++    };
  3.1242 ++    static const int iln[32] =
  3.1243 ++    {
  3.1244 ++         0, 63, 62, 31, 30, 29, 28, 27,
  3.1245 ++        26, 25, 24, 23, 22, 21, 20, 19,
  3.1246 ++        18, 17, 16, 15, 14, 13, 12, 11,
  3.1247 ++        10,  9,  8,  7,  6,  5,  4,  0
  3.1248 ++    };
  3.1249 ++    static const int ilp[32] =
  3.1250 ++    {
  3.1251 ++         0, 61, 60, 59, 58, 57, 56, 55,
  3.1252 ++        54, 53, 52, 51, 50, 49, 48, 47,
  3.1253 ++        46, 45, 44, 43, 42, 41, 40, 39,
  3.1254 ++        38, 37, 36, 35, 34, 33, 32,  0
  3.1255 ++    };
  3.1256 ++    static const int wl[8] =
  3.1257 ++    {
  3.1258 ++        -60, -30, 58, 172, 334, 538, 1198, 3042
  3.1259 ++    };
  3.1260 ++    static const int rl42[16] =
  3.1261 ++    {
  3.1262 ++        0, 7, 6, 5, 4, 3, 2, 1, 7, 6, 5, 4, 3, 2, 1, 0
  3.1263 ++    };
  3.1264 ++    static const int ilb[32] =
  3.1265 ++    {
  3.1266 ++        2048, 2093, 2139, 2186, 2233, 2282, 2332,
  3.1267 ++        2383, 2435, 2489, 2543, 2599, 2656, 2714,
  3.1268 ++        2774, 2834, 2896, 2960, 3025, 3091, 3158,
  3.1269 ++        3228, 3298, 3371, 3444, 3520, 3597, 3676,
  3.1270 ++        3756, 3838, 3922, 4008
  3.1271 ++    };
  3.1272 ++    static const int qm4[16] =
  3.1273 ++    {
  3.1274 ++             0, -20456, -12896, -8968,
  3.1275 ++         -6288,  -4240,  -2584, -1200,
  3.1276 ++         20456,  12896,   8968,  6288,
  3.1277 ++          4240,   2584,   1200,     0
  3.1278 ++    };
  3.1279 ++    static const int qm2[4] =
  3.1280 ++    {
  3.1281 ++        -7408,  -1616,   7408,   1616
  3.1282 ++    };
  3.1283 ++    static const int qmf_coeffs[12] =
  3.1284 ++    {
  3.1285 ++           3,  -11,   12,   32, -210,  951, 3876, -805,  362, -156,   53,  -11,
  3.1286 ++    };
  3.1287 ++    static const int ihn[3] = {0, 1, 0};
  3.1288 ++    static const int ihp[3] = {0, 3, 2};
  3.1289 ++    static const int wh[3] = {0, -214, 798};
  3.1290 ++    static const int rh2[4] = {2, 1, 2, 1};
  3.1291 ++
  3.1292 ++    int dlow;
  3.1293 ++    int dhigh;
  3.1294 ++    int el;
  3.1295 ++    int wd;
  3.1296 ++    int wd1;
  3.1297 ++    int ril;
  3.1298 ++    int wd2;
  3.1299 ++    int il4;
  3.1300 ++    int ih2;
  3.1301 ++    int wd3;
  3.1302 ++    int eh;
  3.1303 ++    int mih;
  3.1304 ++    int i;
  3.1305 ++    int j;
  3.1306 ++    /* Low and high band PCM from the QMF */
  3.1307 ++    int xlow;
  3.1308 ++    int xhigh;
  3.1309 ++    int g722_bytes;
  3.1310 ++    /* Even and odd tap accumulators */
  3.1311 ++    int sumeven;
  3.1312 ++    int sumodd;
  3.1313 ++    int ihigh;
  3.1314 ++    int ilow;
  3.1315 ++    int code;
  3.1316 ++
  3.1317 ++    g722_bytes = 0;
  3.1318 ++    xhigh = 0;
  3.1319 ++    for (j = 0;  j < len;  )
  3.1320 ++    {
  3.1321 ++        if (s->itu_test_mode)
  3.1322 ++        {
  3.1323 ++            xlow =
  3.1324 ++            xhigh = amp[j++] >> 1;
  3.1325 ++        }
  3.1326 ++        else
  3.1327 ++        {
  3.1328 ++            if (s->eight_k)
  3.1329 ++            {
  3.1330 ++                xlow = amp[j++];
  3.1331 ++            }
  3.1332 ++            else
  3.1333 ++            {
  3.1334 ++                /* Apply the transmit QMF */
  3.1335 ++                /* Shuffle the buffer down */
  3.1336 ++                for (i = 0;  i < 22;  i++)
  3.1337 ++                    s->x[i] = s->x[i + 2];
  3.1338 ++                s->x[22] = amp[j++];
  3.1339 ++                s->x[23] = amp[j++];
  3.1340 ++    
  3.1341 ++                /* Discard every other QMF output */
  3.1342 ++                sumeven = 0;
  3.1343 ++                sumodd = 0;
  3.1344 ++                for (i = 0;  i < 12;  i++)
  3.1345 ++                {
  3.1346 ++                    sumodd += s->x[2*i]*qmf_coeffs[i];
  3.1347 ++                    sumeven += s->x[2*i + 1]*qmf_coeffs[11 - i];
  3.1348 ++                }
  3.1349 ++                xlow = (sumeven + sumodd) >> 13;
  3.1350 ++                xhigh = (sumeven - sumodd) >> 13;
  3.1351 ++            }
  3.1352 ++        }
  3.1353 ++        /* Block 1L, SUBTRA */
  3.1354 ++        el = saturate(xlow - s->band[0].s);
  3.1355 ++
  3.1356 ++        /* Block 1L, QUANTL */
  3.1357 ++        wd = (el >= 0)  ?  el  :  -(el + 1);
  3.1358 ++
  3.1359 ++        for (i = 1;  i < 30;  i++)
  3.1360 ++        {
  3.1361 ++            wd1 = (q6[i]*s->band[0].det) >> 12;
  3.1362 ++            if (wd < wd1)
  3.1363 ++                break;
  3.1364 ++        }
  3.1365 ++        ilow = (el < 0)  ?  iln[i]  :  ilp[i];
  3.1366 ++
  3.1367 ++        /* Block 2L, INVQAL */
  3.1368 ++        ril = ilow >> 2;
  3.1369 ++        wd2 = qm4[ril];
  3.1370 ++        dlow = (s->band[0].det*wd2) >> 15;
  3.1371 ++
  3.1372 ++        /* Block 3L, LOGSCL */
  3.1373 ++        il4 = rl42[ril];
  3.1374 ++        wd = (s->band[0].nb*127) >> 7;
  3.1375 ++        s->band[0].nb = wd + wl[il4];
  3.1376 ++        if (s->band[0].nb < 0)
  3.1377 ++            s->band[0].nb = 0;
  3.1378 ++        else if (s->band[0].nb > 18432)
  3.1379 ++            s->band[0].nb = 18432;
  3.1380 ++
  3.1381 ++        /* Block 3L, SCALEL */
  3.1382 ++        wd1 = (s->band[0].nb >> 6) & 31;
  3.1383 ++        wd2 = 8 - (s->band[0].nb >> 11);
  3.1384 ++        wd3 = (wd2 < 0)  ?  (ilb[wd1] << -wd2)  :  (ilb[wd1] >> wd2);
  3.1385 ++        s->band[0].det = wd3 << 2;
  3.1386 ++
  3.1387 ++        block4(s, 0, dlow);
  3.1388 ++        
  3.1389 ++        if (s->eight_k)
  3.1390 ++        {
  3.1391 ++            /* Just leave the high bits as zero */
  3.1392 ++            code = (0xC0 | ilow) >> (8 - s->bits_per_sample);
  3.1393 ++        }
  3.1394 ++        else
  3.1395 ++        {
  3.1396 ++            /* Block 1H, SUBTRA */
  3.1397 ++            eh = saturate(xhigh - s->band[1].s);
  3.1398 ++
  3.1399 ++            /* Block 1H, QUANTH */
  3.1400 ++            wd = (eh >= 0)  ?  eh  :  -(eh + 1);
  3.1401 ++            wd1 = (564*s->band[1].det) >> 12;
  3.1402 ++            mih = (wd >= wd1)  ?  2  :  1;
  3.1403 ++            ihigh = (eh < 0)  ?  ihn[mih]  :  ihp[mih];
  3.1404 ++
  3.1405 ++            /* Block 2H, INVQAH */
  3.1406 ++            wd2 = qm2[ihigh];
  3.1407 ++            dhigh = (s->band[1].det*wd2) >> 15;
  3.1408 ++
  3.1409 ++            /* Block 3H, LOGSCH */
  3.1410 ++            ih2 = rh2[ihigh];
  3.1411 ++            wd = (s->band[1].nb*127) >> 7;
  3.1412 ++            s->band[1].nb = wd + wh[ih2];
  3.1413 ++            if (s->band[1].nb < 0)
  3.1414 ++                s->band[1].nb = 0;
  3.1415 ++            else if (s->band[1].nb > 22528)
  3.1416 ++                s->band[1].nb = 22528;
  3.1417 ++
  3.1418 ++            /* Block 3H, SCALEH */
  3.1419 ++            wd1 = (s->band[1].nb >> 6) & 31;
  3.1420 ++            wd2 = 10 - (s->band[1].nb >> 11);
  3.1421 ++            wd3 = (wd2 < 0)  ?  (ilb[wd1] << -wd2)  :  (ilb[wd1] >> wd2);
  3.1422 ++            s->band[1].det = wd3 << 2;
  3.1423 ++
  3.1424 ++            block4(s, 1, dhigh);
  3.1425 ++            code = ((ihigh << 6) | ilow) >> (8 - s->bits_per_sample);
  3.1426 ++        }
  3.1427 ++
  3.1428 ++        if (s->packed)
  3.1429 ++        {
  3.1430 ++            /* Pack the code bits */
  3.1431 ++            s->out_buffer |= (code << s->out_bits);
  3.1432 ++            s->out_bits += s->bits_per_sample;
  3.1433 ++            if (s->out_bits >= 8)
  3.1434 ++            {
  3.1435 ++                g722_data[g722_bytes++] = (uint8_t) (s->out_buffer & 0xFF);
  3.1436 ++                s->out_bits -= 8;
  3.1437 ++                s->out_buffer >>= 8;
  3.1438 ++            }
  3.1439 ++        }
  3.1440 ++        else
  3.1441 ++        {
  3.1442 ++            g722_data[g722_bytes++] = (uint8_t) code;
  3.1443 ++        }
  3.1444 ++    }
  3.1445 ++    return g722_bytes;
  3.1446 ++}
  3.1447 ++/*- End of function --------------------------------------------------------*/
  3.1448 ++/*- End of file ------------------------------------------------------------*/
  3.1449 +Index: codecs/g722/g722.h
  3.1450 +diff -Nau codecs/g722/g722.h.orig codecs/g722/g722.h
  3.1451 +--- codecs/g722/g722.h.orig	1970-01-01 01:00:00.000000000 +0100
  3.1452 ++++ codecs/g722/g722.h	2009-04-24 00:30:33.000000000 +0200
  3.1453 +@@ -0,0 +1,148 @@
  3.1454 ++/*
  3.1455 ++ * SpanDSP - a series of DSP components for telephony
  3.1456 ++ *
  3.1457 ++ * g722.h - The ITU G.722 codec.
  3.1458 ++ *
  3.1459 ++ * Written by Steve Underwood <steveu@coppice.org>
  3.1460 ++ *
  3.1461 ++ * Copyright (C) 2005 Steve Underwood
  3.1462 ++ *
  3.1463 ++ *  Despite my general liking of the GPL, I place my own contributions 
  3.1464 ++ *  to this code in the public domain for the benefit of all mankind -
  3.1465 ++ *  even the slimy ones who might try to proprietize my work and use it
  3.1466 ++ *  to my detriment.
  3.1467 ++ *
  3.1468 ++ * Based on a single channel G.722 codec which is:
  3.1469 ++ *
  3.1470 ++ *****    Copyright (c) CMU    1993      *****
  3.1471 ++ * Computer Science, Speech Group
  3.1472 ++ * Chengxiang Lu and Alex Hauptmann
  3.1473 ++ *
  3.1474 ++ * $Id: g722.h 48959 2006-12-25 06:42:15Z rizzo $
  3.1475 ++ */
  3.1476 ++
  3.1477 ++
  3.1478 ++/*! \file */
  3.1479 ++
  3.1480 ++#if !defined(_G722_H_)
  3.1481 ++#define _G722_H_
  3.1482 ++
  3.1483 ++/*! \page g722_page G.722 encoding and decoding
  3.1484 ++\section g722_page_sec_1 What does it do?
  3.1485 ++The G.722 module is a bit exact implementation of the ITU G.722 specification for all three
  3.1486 ++specified bit rates - 64000bps, 56000bps and 48000bps. It passes the ITU tests.
  3.1487 ++
  3.1488 ++To allow fast and flexible interworking with narrow band telephony, the encoder and decoder
  3.1489 ++support an option for the linear audio to be an 8k samples/second stream. In this mode the
  3.1490 ++codec is considerably faster, and still fully compatible with wideband terminals using G.722.
  3.1491 ++
  3.1492 ++\section g722_page_sec_2 How does it work?
  3.1493 ++???.
  3.1494 ++*/
  3.1495 ++
  3.1496 ++enum
  3.1497 ++{
  3.1498 ++    G722_SAMPLE_RATE_8000 = 0x0001,
  3.1499 ++    G722_PACKED = 0x0002
  3.1500 ++};
  3.1501 ++
  3.1502 ++#ifndef INT16_MAX
  3.1503 ++#define INT16_MAX       32767
  3.1504 ++#endif
  3.1505 ++#ifndef INT16_MIN
  3.1506 ++#define INT16_MIN       (-32768)
  3.1507 ++#endif
  3.1508 ++
  3.1509 ++typedef struct
  3.1510 ++{
  3.1511 ++    /*! TRUE if the operating in the special ITU test mode, with the band split filters
  3.1512 ++             disabled. */
  3.1513 ++    int itu_test_mode;
  3.1514 ++    /*! TRUE if the G.722 data is packed */
  3.1515 ++    int packed;
  3.1516 ++    /*! TRUE if encode from 8k samples/second */
  3.1517 ++    int eight_k;
  3.1518 ++    /*! 6 for 48000kbps, 7 for 56000kbps, or 8 for 64000kbps. */
  3.1519 ++    int bits_per_sample;
  3.1520 ++
  3.1521 ++    /*! Signal history for the QMF */
  3.1522 ++    int x[24];
  3.1523 ++
  3.1524 ++    struct
  3.1525 ++    {
  3.1526 ++        int s;
  3.1527 ++        int sp;
  3.1528 ++        int sz;
  3.1529 ++        int r[3];
  3.1530 ++        int a[3];
  3.1531 ++        int ap[3];
  3.1532 ++        int p[3];
  3.1533 ++        int d[7];
  3.1534 ++        int b[7];
  3.1535 ++        int bp[7];
  3.1536 ++        int sg[7];
  3.1537 ++        int nb;
  3.1538 ++        int det;
  3.1539 ++    } band[2];
  3.1540 ++
  3.1541 ++    unsigned int in_buffer;
  3.1542 ++    int in_bits;
  3.1543 ++    unsigned int out_buffer;
  3.1544 ++    int out_bits;
  3.1545 ++} g722_encode_state_t;
  3.1546 ++
  3.1547 ++typedef struct
  3.1548 ++{
  3.1549 ++    /*! TRUE if the operating in the special ITU test mode, with the band split filters
  3.1550 ++             disabled. */
  3.1551 ++    int itu_test_mode;
  3.1552 ++    /*! TRUE if the G.722 data is packed */
  3.1553 ++    int packed;
  3.1554 ++    /*! TRUE if decode to 8k samples/second */
  3.1555 ++    int eight_k;
  3.1556 ++    /*! 6 for 48000kbps, 7 for 56000kbps, or 8 for 64000kbps. */
  3.1557 ++    int bits_per_sample;
  3.1558 ++
  3.1559 ++    /*! Signal history for the QMF */
  3.1560 ++    int x[24];
  3.1561 ++
  3.1562 ++    struct
  3.1563 ++    {
  3.1564 ++        int s;
  3.1565 ++        int sp;
  3.1566 ++        int sz;
  3.1567 ++        int r[3];
  3.1568 ++        int a[3];
  3.1569 ++        int ap[3];
  3.1570 ++        int p[3];
  3.1571 ++        int d[7];
  3.1572 ++        int b[7];
  3.1573 ++        int bp[7];
  3.1574 ++        int sg[7];
  3.1575 ++        int nb;
  3.1576 ++        int det;
  3.1577 ++    } band[2];
  3.1578 ++    
  3.1579 ++    unsigned int in_buffer;
  3.1580 ++    int in_bits;
  3.1581 ++    unsigned int out_buffer;
  3.1582 ++    int out_bits;
  3.1583 ++} g722_decode_state_t;
  3.1584 ++
  3.1585 ++#ifdef __cplusplus
  3.1586 ++extern "C" {
  3.1587 ++#endif
  3.1588 ++
  3.1589 ++g722_encode_state_t *g722_encode_init(g722_encode_state_t *s, int rate, int options);
  3.1590 ++int g722_encode_release(g722_encode_state_t *s);
  3.1591 ++int g722_encode(g722_encode_state_t *s, uint8_t g722_data[], const int16_t amp[], int len);
  3.1592 ++
  3.1593 ++g722_decode_state_t *g722_decode_init(g722_decode_state_t *s, int rate, int options);
  3.1594 ++int g722_decode_release(g722_decode_state_t *s);
  3.1595 ++int g722_decode(g722_decode_state_t *s, int16_t amp[], const uint8_t g722_data[], int len);
  3.1596 ++
  3.1597 ++#ifdef __cplusplus
  3.1598 ++}
  3.1599 ++#endif
  3.1600 ++
  3.1601 ++#endif
  3.1602 +Index: codecs/g722/Makefile
  3.1603 +diff -Nau codecs/g722/Makefile.orig codecs/g722/Makefile
  3.1604 +--- codecs/g722/Makefile.orig	1970-01-01 01:00:00.000000000 +0100
  3.1605 ++++ codecs/g722/Makefile	2009-04-24 00:30:33.000000000 +0200
  3.1606 +@@ -0,0 +1,18 @@
  3.1607 ++LIB=libg722.a
  3.1608 ++CFLAGS+=-fPIC
  3.1609 ++
  3.1610 ++include $(ASTTOPDIR)/Makefile.rules
  3.1611 ++
  3.1612 ++OBJS=g722_encode.o g722_decode.o
  3.1613 ++
  3.1614 ++all: $(LIB)
  3.1615 ++
  3.1616 ++$(LIB): $(OBJS)
  3.1617 ++	$(ECHO_PREFIX) echo "   [AR] $^ -> $@"
  3.1618 ++	$(CMD_PREFIX) $(AR) cr $@ $^
  3.1619 ++	$(CMD_PREFIX) $(RANLIB) $@
  3.1620 ++
  3.1621 ++clean:
  3.1622 ++	rm -f $(LIB) *.o
  3.1623 ++	rm -f .*.o.d
  3.1624 ++	rm -f *.s *.i
  3.1625 +Index: codecs/g722_slin_ex.h
  3.1626 +diff -Nau codecs/g722_slin_ex.h.orig codecs/g722_slin_ex.h
  3.1627 +--- codecs/g722_slin_ex.h.orig	1970-01-01 01:00:00.000000000 +0100
  3.1628 ++++ codecs/g722_slin_ex.h	2009-04-24 00:30:33.000000000 +0200
  3.1629 +@@ -0,0 +1,25 @@
  3.1630 ++/*! \file
  3.1631 ++ * \brief g722_slin_ex.h --
  3.1632 ++ *
  3.1633 ++ *	4-bit ADPCM data, 20 milliseconds worth at 8 kHz.
  3.1634 ++ *
  3.1635 ++ * Source: g723.example
  3.1636 ++ *
  3.1637 ++ * Copyright (C) 2001-2005, Digium Inc.
  3.1638 ++ *
  3.1639 ++ * Distributed under the terms of the GNU General Public License
  3.1640 ++ *
  3.1641 ++ */
  3.1642 ++
  3.1643 ++static unsigned char g722_slin_ex[] = {
  3.1644 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1645 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1646 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1647 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1648 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1649 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1650 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1651 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1652 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
  3.1653 ++	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
  3.1654 ++};
  3.1655 +Index: codecs/Makefile
  3.1656 +diff -Nau codecs/Makefile.orig codecs/Makefile
  3.1657 +--- codecs/Makefile.orig	2008-03-26 17:42:35.000000000 +0100
  3.1658 ++++ codecs/Makefile	2009-04-24 00:30:33.000000000 +0200
  3.1659 +@@ -31,6 +31,7 @@
  3.1660 + 
  3.1661 + LIBILBC:=ilbc/libilbc.a
  3.1662 + LIBLPC10:=lpc10/liblpc10.a
  3.1663 ++LIBG722:=g722/libg722.a
  3.1664 + 
  3.1665 + all: _all
  3.1666 + 
  3.1667 +@@ -45,6 +46,7 @@
  3.1668 + 	$(MAKE) -C gsm clean
  3.1669 + 	$(MAKE) -C lpc10 clean
  3.1670 + 	$(MAKE) -C ilbc clean
  3.1671 ++	$(MAKE) -C g722 clean
  3.1672 + 
  3.1673 + gsm/lib/libgsm.a:
  3.1674 + 	@mkdir -p gsm/lib
  3.1675 +@@ -59,3 +61,8 @@
  3.1676 + 	@$(MAKE) -C ilbc all ASTCFLAGS="$(filter-out -Wmissing-prototypes -Wmissing-declarations,$(ASTCFLAGS)) $(AST_NO_STRICT_OVERFLOW)"
  3.1677 + 
  3.1678 + $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC)
  3.1679 ++
  3.1680 ++$(LIBG722):
  3.1681 ++	@$(MAKE) -C g722 all
  3.1682 ++
  3.1683 ++$(if $(filter codec_g722,$(EMBEDDED_MODS)),modules.link,codec_g722.so): $(LIBG722)
  3.1684 +Index: codecs/slin_g722_ex.h
  3.1685 +diff -Nau codecs/slin_g722_ex.h.orig codecs/slin_g722_ex.h
  3.1686 +--- codecs/slin_g722_ex.h.orig	1970-01-01 01:00:00.000000000 +0100
  3.1687 ++++ codecs/slin_g722_ex.h	2009-04-24 00:30:33.000000000 +0200
  3.1688 +@@ -0,0 +1,25 @@
  3.1689 ++/*! \file
  3.1690 ++ * \brief slin_g722_ex.h --
  3.1691 ++ *
  3.1692 ++ *	Signed 16-bit audio data, 10 milliseconds worth at 8 kHz.
  3.1693 ++ *
  3.1694 ++ * Source: g723.example
  3.1695 ++ *
  3.1696 ++ * Copyright (C) 2001-2005, Digium Inc.
  3.1697 ++ *
  3.1698 ++ * Distributed under the terms of the GNU General Public License
  3.1699 ++ *
  3.1700 ++ */
  3.1701 ++
  3.1702 ++static signed short slin_g722_ex[] = {
  3.1703 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1704 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1705 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1706 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1707 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1708 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1709 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1710 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1711 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
  3.1712 ++	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
  3.1713 ++};
  3.1714 +Index: configure
  3.1715 +diff -Nau configure.orig configure
  3.1716 +--- configure.orig	2009-02-18 21:06:45.000000000 +0100
  3.1717 ++++ configure	2009-04-24 00:30:33.000000000 +0200
  3.1718 +@@ -11143,6 +11143,61 @@
  3.1719 + 
  3.1720 + fi
  3.1721 + 
  3.1722 ++{ echo "$as_me:$LINENO: checking for tm_gmtoff in struct tm" >&5
  3.1723 ++echo $ECHO_N "checking for tm_gmtoff in struct tm... $ECHO_C" >&6; }
  3.1724 ++if test "${ac_cv_struct_tm_gmtoff+set}" = set; then
  3.1725 ++  echo $ECHO_N "(cached) $ECHO_C" >&6
  3.1726 ++else
  3.1727 ++  cat >conftest.$ac_ext <<_ACEOF
  3.1728 ++/* confdefs.h.  */
  3.1729 ++_ACEOF
  3.1730 ++cat confdefs.h >>conftest.$ac_ext
  3.1731 ++cat >>conftest.$ac_ext <<_ACEOF
  3.1732 ++/* end confdefs.h.  */
  3.1733 ++$ac_includes_default
  3.1734 ++#include <sys/types.h>
  3.1735 ++#include <$ac_cv_struct_tm>
  3.1736 ++int main() {
  3.1737 ++struct tm tm; tm.tm_gmtoff;
  3.1738 ++; return 0; }
  3.1739 ++_ACEOF
  3.1740 ++rm -f conftest.$ac_objext
  3.1741 ++if { (ac_try="$ac_compile"
  3.1742 ++case "(($ac_try" in
  3.1743 ++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  3.1744 ++  *) ac_try_echo=$ac_try;;
  3.1745 ++esac
  3.1746 ++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  3.1747 ++  (eval "$ac_compile") 2>conftest.er1
  3.1748 ++  ac_status=$?
  3.1749 ++  grep -v '^ *+' conftest.er1 >conftest.err
  3.1750 ++  rm -f conftest.er1
  3.1751 ++  cat conftest.err >&5
  3.1752 ++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  3.1753 ++  (exit $ac_status); } && {
  3.1754 ++	 test -z "$ac_c_werror_flag" ||
  3.1755 ++	 test ! -s conftest.err
  3.1756 ++       } && test -s conftest.$ac_objext; then
  3.1757 ++  ac_cv_struct_tm_gmtoff=yes
  3.1758 ++else
  3.1759 ++  echo "$as_me: failed program was:" >&5
  3.1760 ++sed 's/^/| /' conftest.$ac_ext >&5
  3.1761 ++
  3.1762 ++	ac_cv_struct_tm_gmtoff=no
  3.1763 ++fi
  3.1764 ++
  3.1765 ++rm -f conftest*
  3.1766 ++fi
  3.1767 ++{ echo "$as_me:$LINENO: result: $ac_cv_struct_tm_gmtoff" >&5
  3.1768 ++echo "${ECHO_T}$ac_cv_struct_tm_gmtoff" >&6; }
  3.1769 ++if test $ac_cv_struct_tm_gmtoff = yes; then
  3.1770 ++
  3.1771 ++cat >>confdefs.h <<\_ACEOF
  3.1772 ++#define TM_GMTOFF 1
  3.1773 ++_ACEOF
  3.1774 ++
  3.1775 ++fi
  3.1776 ++
  3.1777 + { echo "$as_me:$LINENO: checking for working volatile" >&5
  3.1778 + echo $ECHO_N "checking for working volatile... $ECHO_C" >&6; }
  3.1779 + if test "${ac_cv_c_volatile+set}" = set; then
  3.1780 +Index: include/asterisk/config.h
  3.1781 +diff -Nau include/asterisk/config.h.orig include/asterisk/config.h
  3.1782 +--- include/asterisk/config.h.orig	2009-02-18 19:30:38.000000000 +0100
  3.1783 ++++ include/asterisk/config.h	2009-04-24 00:30:33.000000000 +0200
  3.1784 +@@ -33,6 +33,8 @@
  3.1785 + 
  3.1786 + struct ast_category;
  3.1787 + 
  3.1788 ++#define	CONFIG_STATUS_FILEUNCHANGED	(void *)-1
  3.1789 ++
  3.1790 + struct ast_variable {
  3.1791 + 	char *name;
  3.1792 + 	char *value;
  3.1793 +Index: include/asterisk/frame.h
  3.1794 +diff -Nau include/asterisk/frame.h.orig include/asterisk/frame.h
  3.1795 +--- include/asterisk/frame.h.orig	2009-03-05 19:22:16.000000000 +0100
  3.1796 ++++ include/asterisk/frame.h	2009-04-24 00:30:33.000000000 +0200
  3.1797 +@@ -260,6 +260,8 @@
  3.1798 + #define AST_FORMAT_G726		(1 << 11)
  3.1799 + /*! G.722 */
  3.1800 + #define AST_FORMAT_G722		(1 << 12)
  3.1801 ++/*! Raw 16-bit Signed Linear (16000 Hz) PCM */
  3.1802 ++#define AST_FORMAT_SLINEAR16   (1 << 15)
  3.1803 + /*! Unsupported audio bits */
  3.1804 + #define AST_FORMAT_AUDIO_UNDEFINED	((1 << 13) | (1 << 14) | (1 << 15))
  3.1805 + /*! Maximum audio format */
  3.1806 +Index: main/editline/np/vis.h
  3.1807 +diff -Nau main/editline/np/vis.h.orig main/editline/np/vis.h
  3.1808 +--- main/editline/np/vis.h.orig	2006-08-21 04:11:39.000000000 +0200
  3.1809 ++++ main/editline/np/vis.h	2009-04-24 00:30:33.000000000 +0200
  3.1810 +@@ -76,6 +76,22 @@
  3.1811 + 
  3.1812 + #include <sys/cdefs.h>
  3.1813 + 
  3.1814 ++/* correct nonportable unsigned type usage */
  3.1815 ++#if !defined(__FreeBSD__) && !defined(__linux__)
  3.1816 ++#ifndef u_int64_t
  3.1817 ++#define u_int64_t unsigned long long
  3.1818 ++#endif
  3.1819 ++#ifndef u_int32_t
  3.1820 ++#define u_int32_t unsigned int
  3.1821 ++#endif
  3.1822 ++#ifndef u_int16_t
  3.1823 ++#define u_int16_t unsigned short
  3.1824 ++#endif
  3.1825 ++#ifndef u_int6_t
  3.1826 ++#define u_int8_t unsigned char
  3.1827 ++#endif
  3.1828 ++#endif
  3.1829 ++
  3.1830 + __BEGIN_DECLS
  3.1831 + char	*vis __P((char *, int, int, int));
  3.1832 + char	*svis __P((char *, int, int, int, const char *));
  3.1833 +Index: main/stdtime/localtime.c
  3.1834 +diff -Nau main/stdtime/localtime.c.orig main/stdtime/localtime.c
  3.1835 +--- main/stdtime/localtime.c.orig	2008-09-27 17:00:48.000000000 +0200
  3.1836 ++++ main/stdtime/localtime.c	2009-04-24 00:30:33.000000000 +0200
  3.1837 +@@ -1134,9 +1134,9 @@
  3.1838 + 	*/
  3.1839 + 	result = timesub(&t, ttisp->tt_gmtoff, sp, tmp);
  3.1840 + 	tmp->tm_isdst = ttisp->tt_isdst;
  3.1841 +-#ifndef SOLARIS /* Solaris doesn't have this element */
  3.1842 ++#ifdef TM_GMTOFF
  3.1843 + 	tmp->tm_gmtoff = ttisp->tt_gmtoff;
  3.1844 +-#endif
  3.1845 ++#endif /* defined TM_GMTOFF */
  3.1846 + #ifdef TM_ZONE
  3.1847 + 	tmp->TM_ZONE = &sp->chars[ttisp->tt_abbrind];
  3.1848 + #endif /* defined TM_ZONE */
  3.1849 +Index: Makefile.moddir_rules
  3.1850 +diff -Nau Makefile.moddir_rules.orig Makefile.moddir_rules
  3.1851 +--- Makefile.moddir_rules.orig	2008-11-26 19:36:24.000000000 +0100
  3.1852 ++++ Makefile.moddir_rules	2009-04-24 00:30:33.000000000 +0200
  3.1853 +@@ -69,7 +69,9 @@
  3.1854 + 	rm -f modules.link
  3.1855 + 
  3.1856 + install:: all
  3.1857 ++ifneq ($(LOADABLE_MODS),)
  3.1858 + 	for x in $(LOADABLE_MODS:%=%.so); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
  3.1859 ++endif
  3.1860 + 
  3.1861 + uninstall::
  3.1862 + 
  3.1863 +Index: res/res_features.c
  3.1864 +diff -Nau res/res_features.c.orig res/res_features.c
  3.1865 +--- res/res_features.c.orig	2009-03-03 19:27:09.000000000 +0100
  3.1866 ++++ res/res_features.c	2009-04-24 00:30:33.000000000 +0200
  3.1867 +@@ -732,6 +732,10 @@
  3.1868 + 			snprintf(args, len, "%s|%s|m", S_OR(touch_format, "wav"), touch_filename);
  3.1869 + 		}
  3.1870 + 
  3.1871 ++		for( x = 0; x < strlen(touch_filename); x++) {
  3.1872 ++			if (touch_filename[x] == '/')
  3.1873 ++				touch_filename[x] = '-';
  3.1874 ++		}
  3.1875 + 		for( x = 0; x < strlen(args); x++) {
  3.1876 + 			if (args[x] == '/')
  3.1877 + 				args[x] = '-';
  3.1878 +@@ -2774,6 +2778,293 @@
  3.1879 + 	}
  3.1880 + }
  3.1881 + 
  3.1882 ++static char mandescr_bridge[] =
  3.1883 ++"Description: Bridge together two channels already in the PBX\n"
  3.1884 ++"Variables: ( Headers marked with * are required )\n"
  3.1885 ++"   *Channel1: Channel to Bridge to Channel2\n"
  3.1886 ++"   *Channel2: Channel to Bridge to Channel1\n"
  3.1887 ++"        Tone: (Yes|No) Play courtesy tone to Channel 2\n"
  3.1888 ++"\n";
  3.1889 ++
  3.1890 ++/*!
  3.1891 ++ * \brief Actual bridge
  3.1892 ++ * \param chan
  3.1893 ++ * \param tmpchan
  3.1894 ++ * 
  3.1895 ++ * Stop hold music, lock both channels, masq channels,
  3.1896 ++ * after bridge return channel to next priority.
  3.1897 ++*/
  3.1898 ++static void do_bridge_masquerade(struct ast_channel *chan, struct ast_channel *tmpchan)
  3.1899 ++{
  3.1900 ++	ast_moh_stop(chan);
  3.1901 ++	ast_channel_lock(chan);
  3.1902 ++	ast_setstate(tmpchan, chan->_state);
  3.1903 ++	tmpchan->readformat = chan->readformat;
  3.1904 ++	tmpchan->writeformat = chan->writeformat;
  3.1905 ++	ast_channel_masquerade(tmpchan, chan);
  3.1906 ++	ast_channel_lock(tmpchan);
  3.1907 ++	ast_do_masquerade(tmpchan);
  3.1908 ++	/* when returning from bridge, the channel will continue at the next priority */
  3.1909 ++	ast_explicit_goto(tmpchan, chan->context, chan->exten, chan->priority + 1);
  3.1910 ++	ast_channel_unlock(tmpchan);
  3.1911 ++	ast_channel_unlock(chan);
  3.1912 ++}
  3.1913 ++
  3.1914 ++/*!
  3.1915 ++ * \brief Bridge channels together
  3.1916 ++ * \param s
  3.1917 ++ * \param m
  3.1918 ++ * 
  3.1919 ++ * Make sure valid channels were specified, 
  3.1920 ++ * send errors if any of the channels could not be found/locked, answer channels if needed,
  3.1921 ++ * create the placeholder channels and grab the other channels 
  3.1922 ++ * make the channels compatible, send error if we fail doing so 
  3.1923 ++ * setup the bridge thread object and start the bridge.
  3.1924 ++ * 
  3.1925 ++ * \retval 0 on success or on incorrect use.
  3.1926 ++ * \retval 1 on failure to bridge channels.
  3.1927 ++*/
  3.1928 ++static int action_bridge(struct mansession *s, const struct message *m)
  3.1929 ++{
  3.1930 ++	const char *channela = astman_get_header(m, "Channel1");
  3.1931 ++	const char *channelb = astman_get_header(m, "Channel2");
  3.1932 ++	const char *playtone = astman_get_header(m, "Tone");
  3.1933 ++	struct ast_channel *chana = NULL, *chanb = NULL;
  3.1934 ++	struct ast_channel *tmpchana = NULL, *tmpchanb = NULL;
  3.1935 ++	struct ast_bridge_thread_obj *tobj = NULL;
  3.1936 ++
  3.1937 ++	/* make sure valid channels were specified */
  3.1938 ++	if (!ast_strlen_zero(channela) && !ast_strlen_zero(channelb)) {
  3.1939 ++		chana = ast_get_channel_by_name_prefix_locked(channela, strlen(channela));
  3.1940 ++		chanb = ast_get_channel_by_name_prefix_locked(channelb, strlen(channelb));
  3.1941 ++		if (chana)
  3.1942 ++			ast_channel_unlock(chana);
  3.1943 ++		if (chanb)
  3.1944 ++			ast_channel_unlock(chanb);
  3.1945 ++
  3.1946 ++		/* send errors if any of the channels could not be found/locked */
  3.1947 ++		if (!chana) {
  3.1948 ++			char buf[256];
  3.1949 ++			snprintf(buf, sizeof(buf), "Channel1 does not exist: %s", channela);
  3.1950 ++			astman_send_error(s, m, buf);
  3.1951 ++			return 0;
  3.1952 ++		}
  3.1953 ++		if (!chanb) {
  3.1954 ++			char buf[256];
  3.1955 ++			snprintf(buf, sizeof(buf), "Channel2 does not exist: %s", channelb);
  3.1956 ++			astman_send_error(s, m, buf);
  3.1957 ++			return 0;
  3.1958 ++		}
  3.1959 ++	} else {
  3.1960 ++		astman_send_error(s, m, "Missing channel parameter in request");
  3.1961 ++		return 0;
  3.1962 ++	}
  3.1963 ++
  3.1964 ++	/* Answer the channels if needed */
  3.1965 ++	if (chana->_state != AST_STATE_UP)
  3.1966 ++		ast_answer(chana);
  3.1967 ++	if (chanb->_state != AST_STATE_UP)
  3.1968 ++		ast_answer(chanb);
  3.1969 ++
  3.1970 ++	/* create the placeholder channels and grab the other channels */
  3.1971 ++	if (!(tmpchana = ast_channel_alloc(0, AST_STATE_DOWN, NULL, NULL, NULL, 
  3.1972 ++		NULL, NULL, 0, "Bridge/%s", chana->name))) {
  3.1973 ++		astman_send_error(s, m, "Unable to create temporary channel!");
  3.1974 ++		return 1;
  3.1975 ++	}
  3.1976 ++
  3.1977 ++	if (!(tmpchanb = ast_channel_alloc(0, AST_STATE_DOWN, NULL, NULL, NULL, 
  3.1978 ++		NULL, NULL, 0, "Bridge/%s", chanb->name))) {
  3.1979 ++		astman_send_error(s, m, "Unable to create temporary channels!");
  3.1980 ++		ast_channel_free(tmpchana);
  3.1981 ++		return 1;
  3.1982 ++	}
  3.1983 ++
  3.1984 ++	do_bridge_masquerade(chana, tmpchana);
  3.1985 ++	do_bridge_masquerade(chanb, tmpchanb);
  3.1986 ++	
  3.1987 ++	/* make the channels compatible, send error if we fail doing so */
  3.1988 ++	if (ast_channel_make_compatible(tmpchana, tmpchanb)) {
  3.1989 ++		ast_log(LOG_WARNING, "Could not make channels %s and %s compatible for manager bridge\n", tmpchana->name, tmpchanb->name);
  3.1990 ++		astman_send_error(s, m, "Could not make channels compatible for manager bridge");
  3.1991 ++		ast_hangup(tmpchana);
  3.1992 ++		ast_hangup(tmpchanb);
  3.1993 ++		return 1;
  3.1994 ++	}
  3.1995 ++
  3.1996 ++	/* setup the bridge thread object and start the bridge */
  3.1997 ++	if (!(tobj = ast_calloc(1, sizeof(*tobj)))) {
  3.1998 ++		ast_log(LOG_WARNING, "Unable to spawn a new bridge thread on %s and %s: %s\n", tmpchana->name, tmpchanb->name, strerror(errno));
  3.1999 ++		astman_send_error(s, m, "Unable to spawn a new bridge thread");
  3.2000 ++		ast_hangup(tmpchana);
  3.2001 ++		ast_hangup(tmpchanb);
  3.2002 ++		return 1;
  3.2003 ++	}
  3.2004 ++
  3.2005 ++	tobj->chan = tmpchana;
  3.2006 ++	tobj->peer = tmpchanb;
  3.2007 ++	
  3.2008 ++	if (ast_true(playtone)) {
  3.2009 ++		if (!ast_strlen_zero(xfersound) && !ast_streamfile(tmpchanb, xfersound, tmpchanb->language)) {
  3.2010 ++			if (ast_waitstream(tmpchanb, "") < 0)
  3.2011 ++				ast_log(LOG_WARNING, "Failed to play a courtesy tone on chan %s\n", tmpchanb->name);
  3.2012 ++		}
  3.2013 ++	}
  3.2014 ++
  3.2015 ++	ast_bridge_call_thread_launch(tobj);
  3.2016 ++
  3.2017 ++	astman_send_ack(s, m, "Launched bridge thread with success");
  3.2018 ++
  3.2019 ++	return 0;
  3.2020 ++}
  3.2021 ++
  3.2022 ++static char *app_bridge = "Bridge";
  3.2023 ++static char *bridge_synopsis = "Bridge two channels";
  3.2024 ++static char *bridge_descrip =
  3.2025 ++"Usage: Bridge(channel[,options])\n"
  3.2026 ++"	Allows the ability to bridge two channels via the dialplan.\n"
  3.2027 ++"The current channel is bridged to the specified 'channel'.\n"
  3.2028 ++"  Options:\n"
  3.2029 ++"    p - Play a courtesy tone to 'channel'.\n"
  3.2030 ++"This application sets the following channel variable upon completion:\n"
  3.2031 ++" BRIDGERESULT    The result of the bridge attempt as a text string, one of\n"
  3.2032 ++"           SUCCESS | FAILURE | LOOP | NONEXISTENT | INCOMPATIBLE\n";
  3.2033 ++
  3.2034 ++enum {
  3.2035 ++	BRIDGE_OPT_PLAYTONE = (1 << 0),
  3.2036 ++};
  3.2037 ++
  3.2038 ++AST_APP_OPTIONS(bridge_exec_options, BEGIN_OPTIONS
  3.2039 ++	AST_APP_OPTION('p', BRIDGE_OPT_PLAYTONE)
  3.2040 ++END_OPTIONS );
  3.2041 ++
  3.2042 ++/*!
  3.2043 ++ * \brief Bridge channels
  3.2044 ++ * \param chan
  3.2045 ++ * \param data channel to bridge with.
  3.2046 ++ * 
  3.2047 ++ * Split data, check we aren't bridging with ourself, check valid channel,
  3.2048 ++ * answer call if not already, check compatible channels, setup bridge config
  3.2049 ++ * now bridge call, if transfered party hangs up return to PBX extension.
  3.2050 ++*/
  3.2051 ++static int bridge_exec(struct ast_channel *chan, void *data)
  3.2052 ++{
  3.2053 ++	struct ast_channel *current_dest_chan, *final_dest_chan;
  3.2054 ++	char *tmp_data  = NULL;
  3.2055 ++	struct ast_flags opts = { 0, };
  3.2056 ++	struct ast_bridge_config bconfig = { { 0, }, };
  3.2057 ++
  3.2058 ++	AST_DECLARE_APP_ARGS(args,
  3.2059 ++		AST_APP_ARG(dest_chan);
  3.2060 ++		AST_APP_ARG(options);
  3.2061 ++	);
  3.2062 ++	
  3.2063 ++	if (ast_strlen_zero(data)) {
  3.2064 ++		ast_log(LOG_WARNING, "Bridge require at least 1 argument specifying the other end of the bridge\n");
  3.2065 ++		return -1;
  3.2066 ++	}
  3.2067 ++
  3.2068 ++	tmp_data = ast_strdupa(data);
  3.2069 ++	AST_STANDARD_APP_ARGS(args, tmp_data);
  3.2070 ++	if (!ast_strlen_zero(args.options))
  3.2071 ++		ast_app_parse_options(bridge_exec_options, &opts, NULL, args.options);
  3.2072 ++
  3.2073 ++	/* avoid bridge with ourselves */
  3.2074 ++	if (!strncmp(chan->name, args.dest_chan, 
  3.2075 ++		strlen(chan->name) < strlen(args.dest_chan) ? 
  3.2076 ++		strlen(chan->name) : strlen(args.dest_chan))) {
  3.2077 ++		ast_log(LOG_WARNING, "Unable to bridge channel %s with itself\n", chan->name);
  3.2078 ++		manager_event(EVENT_FLAG_CALL, "BridgeExec",
  3.2079 ++					"Response: Failed\r\n"
  3.2080 ++					"Reason: Unable to bridge channel to itself\r\n"
  3.2081 ++					"Channel1: %s\r\n"
  3.2082 ++					"Channel2: %s\r\n",
  3.2083 ++					chan->name, args.dest_chan);
  3.2084 ++		pbx_builtin_setvar_helper(chan, "BRIDGERESULT", "LOOP");
  3.2085 ++		return 0;
  3.2086 ++	}
  3.2087 ++
  3.2088 ++	/* make sure we have a valid end point */
  3.2089 ++	if (!(current_dest_chan = ast_get_channel_by_name_prefix_locked(args.dest_chan, 
  3.2090 ++		strlen(args.dest_chan)))) {
  3.2091 ++		ast_log(LOG_WARNING, "Bridge failed because channel %s does not exist or we "
  3.2092 ++			"cannot get its lock\n", args.dest_chan);
  3.2093 ++		manager_event(EVENT_FLAG_CALL, "BridgeExec",
  3.2094 ++					"Response: Failed\r\n"
  3.2095 ++					"Reason: Cannot grab end point\r\n"
  3.2096 ++					"Channel1: %s\r\n"
  3.2097 ++					"Channel2: %s\r\n", chan->name, args.dest_chan);
  3.2098 ++		pbx_builtin_setvar_helper(chan, "BRIDGERESULT", "NONEXISTENT");
  3.2099 ++		return 0;
  3.2100 ++	}
  3.2101 ++	ast_channel_unlock(current_dest_chan);
  3.2102 ++
  3.2103 ++	/* answer the channel if needed */
  3.2104 ++	if (current_dest_chan->_state != AST_STATE_UP)
  3.2105 ++		ast_answer(current_dest_chan);
  3.2106 ++
  3.2107 ++	/* try to allocate a place holder where current_dest_chan will be placed */
  3.2108 ++	if (!(final_dest_chan = ast_channel_alloc(0, AST_STATE_DOWN, NULL, NULL, NULL, 
  3.2109 ++		NULL, NULL, 0, "Bridge/%s", current_dest_chan->name))) {
  3.2110 ++		ast_log(LOG_WARNING, "Cannot create placeholder channel for chan %s\n", args.dest_chan);
  3.2111 ++		manager_event(EVENT_FLAG_CALL, "BridgeExec",
  3.2112 ++					"Response: Failed\r\n"
  3.2113 ++					"Reason: cannot create placeholder\r\n"
  3.2114 ++					"Channel1: %s\r\n"
  3.2115 ++					"Channel2: %s\r\n", chan->name, args.dest_chan);
  3.2116 ++	}
  3.2117 ++	do_bridge_masquerade(current_dest_chan, final_dest_chan);
  3.2118 ++
  3.2119 ++	/* now current_dest_chan is a ZOMBIE and with softhangup set to 1 and final_dest_chan is our end point */
  3.2120 ++	/* try to make compatible, send error if we fail */
  3.2121 ++	if (ast_channel_make_compatible(chan, final_dest_chan) < 0) {
  3.2122 ++		ast_log(LOG_WARNING, "Could not make channels %s and %s compatible for bridge\n", chan->name, final_dest_chan->name);
  3.2123 ++		manager_event(EVENT_FLAG_CALL, "BridgeExec",
  3.2124 ++					"Response: Failed\r\n"
  3.2125 ++					"Reason: Could not make channels compatible for bridge\r\n"
  3.2126 ++					"Channel1: %s\r\n"
  3.2127 ++					"Channel2: %s\r\n", chan->name, final_dest_chan->name);
  3.2128 ++		ast_hangup(final_dest_chan); /* may be we should return this channel to the PBX? */
  3.2129 ++		pbx_builtin_setvar_helper(chan, "BRIDGERESULT", "INCOMPATIBLE");
  3.2130 ++		return 0;
  3.2131 ++	}
  3.2132 ++
  3.2133 ++	/* Report that the bridge will be successfull */
  3.2134 ++	manager_event(EVENT_FLAG_CALL, "BridgeExec",
  3.2135 ++				"Response: Success\r\n"
  3.2136 ++				"Channel1: %s\r\n"
  3.2137 ++				"Channel2: %s\r\n", chan->name, final_dest_chan->name);
  3.2138 ++
  3.2139 ++	/* we have 2 valid channels to bridge, now it is just a matter of setting up the bridge config and starting the bridge */	
  3.2140 ++	if (ast_test_flag(&opts, BRIDGE_OPT_PLAYTONE) && !ast_strlen_zero(xfersound)) {
  3.2141 ++		if (!ast_streamfile(final_dest_chan, xfersound, final_dest_chan->language)) {
  3.2142 ++			if (ast_waitstream(final_dest_chan, "") < 0)
  3.2143 ++				ast_log(LOG_WARNING, "Failed to play courtesy tone on %s\n", final_dest_chan->name);
  3.2144 ++		}
  3.2145 ++	}
  3.2146 ++	
  3.2147 ++	/* do the bridge */
  3.2148 ++	ast_bridge_call(chan, final_dest_chan, &bconfig);
  3.2149 ++
  3.2150 ++	/* the bridge has ended, set BRIDGERESULT to SUCCESS. If the other channel has not been hung up, return it to the PBX */
  3.2151 ++	pbx_builtin_setvar_helper(chan, "BRIDGERESULT", "SUCCESS");
  3.2152 ++	if (!ast_check_hangup(final_dest_chan)) {
  3.2153 ++		ast_log(LOG_EVENT, "starting new PBX in %s,%s,%d for chan %s\n", 
  3.2154 ++			final_dest_chan->context, final_dest_chan->exten, 
  3.2155 ++			final_dest_chan->priority, final_dest_chan->name);
  3.2156 ++
  3.2157 ++		if (ast_pbx_start(final_dest_chan) != AST_PBX_SUCCESS) {
  3.2158 ++			ast_log(LOG_WARNING, "FAILED continuing PBX on dest chan %s\n", final_dest_chan->name);
  3.2159 ++			ast_hangup(final_dest_chan);
  3.2160 ++		} else
  3.2161 ++			ast_log(LOG_EVENT, "SUCCESS continuing PBX on chan %s\n", final_dest_chan->name);
  3.2162 ++	} else {
  3.2163 ++		ast_log(LOG_EVENT, "hangup chan %s since the other endpoint has hung up\n", final_dest_chan->name);
  3.2164 ++		ast_hangup(final_dest_chan);
  3.2165 ++	}
  3.2166 ++
  3.2167 ++	return 0;
  3.2168 ++}
  3.2169 + 
  3.2170 + static int load_config(void) 
  3.2171 + {
  3.2172 +@@ -3034,6 +3325,8 @@
  3.2173 + {
  3.2174 + 	int res;
  3.2175 + 	
  3.2176 ++	ast_register_application(app_bridge, bridge_exec, bridge_synopsis, bridge_descrip);
  3.2177 ++
  3.2178 + 	memset(parking_ext, 0, sizeof(parking_ext));
  3.2179 + 	memset(parking_con, 0, sizeof(parking_con));
  3.2180 + 
  3.2181 +@@ -3048,6 +3341,7 @@
  3.2182 + 		ast_manager_register("ParkedCalls", 0, manager_parking_status, "List parked calls" );
  3.2183 + 		ast_manager_register2("Park", EVENT_FLAG_CALL, manager_park,
  3.2184 + 			"Park a channel", mandescr_park); 
  3.2185 ++		ast_manager_register2("Bridge", EVENT_FLAG_CALL, action_bridge, "Bridge two channels already in the PBX", mandescr_bridge);
  3.2186 + 	}
  3.2187 + 
  3.2188 + 	res |= ast_devstate_prov_add("Park", metermaidstate);
  3.2189 +Index: apps/app_voicemail.c
  3.2190 +diff -Nau apps/app_voicemail.c.orig apps/app_voicemail.c
  3.2191 +--- apps/app_voicemail.c.orig	2009-04-25 02:38:20.343758775 +0200
  3.2192 ++++ apps/app_voicemail.c	2009-04-25 19:56:25.287569363 +0200
  3.2193 +@@ -115,6 +115,7 @@
  3.2194 + static char imapport[8];
  3.2195 + static char imapflags[128];
  3.2196 + static char imapfolder[64];
  3.2197 ++static int  imapsubfold = 0;
  3.2198 + static char authuser[32];
  3.2199 + static char authpassword[42];
  3.2200 + 
  3.2201 +@@ -4313,6 +4314,7 @@
  3.2202 + 	/* we must use mbox(x) folder names, and copy the message there */
  3.2203 + 	/* simple. huh? */
  3.2204 + 	char sequence[10];
  3.2205 ++	char folder[256];
  3.2206 + 	/* get the real IMAP message number for this message */
  3.2207 + 	snprintf(sequence, sizeof(sequence), "%ld", vms->msgArray[msg]);
  3.2208 + 	if (option_debug > 2)
  3.2209 +@@ -4323,11 +4325,21 @@
  3.2210 + 	} else if (box == 0) {
  3.2211 + 		mail_clearflag(vms->mailstream, sequence, "\\Seen");
  3.2212 + 	}
  3.2213 +-	if (!strcasecmp(mbox(0), vms->curbox) && (box == 0 || box == 1)) {
  3.2214 ++	if ((!strcasecmp(mbox(0), vms->curbox) || \
  3.2215 ++        !strcasecmp(mbox(1), vms->curbox)) && \
  3.2216 ++        (box == 0 || box == 1)) {  /* Don't copy data, just change Seen flag */
  3.2217 + 		ast_mutex_unlock(&vms->lock);
  3.2218 + 		return 0;
  3.2219 +-	} else {
  3.2220 +-		int res = !mail_copy(vms->mailstream,sequence,(char *) mbox(box)); 
  3.2221 ++	} else if (box > 1) {          /* Do copy data using INBOX or subfolder */
  3.2222 ++		if (imapsubfold == 1)
  3.2223 ++			snprintf(folder, sizeof(folder), "%s%c%s", imapfolder, delimiter, mbox(box));
  3.2224 ++		else
  3.2225 ++			strncpy(folder, mbox(box), sizeof(folder));
  3.2226 ++		int res = !mail_copy(vms->mailstream,sequence,folder);
  3.2227 ++		ast_mutex_unlock(&vms->lock);
  3.2228 ++		return res;
  3.2229 ++	} else {  /* Copy data to INBOX delegating new/old status to Seen flag */
  3.2230 ++		int res = !mail_copy(vms->mailstream,sequence,imapfolder);
  3.2231 + 		ast_mutex_unlock(&vms->lock);
  3.2232 + 		return res;
  3.2233 + 	}
  3.2234 +@@ -7686,6 +7698,10 @@
  3.2235 + #ifndef IMAP_STORAGE
  3.2236 + 				} else if (!cmd) {
  3.2237 + 					vms.deleted[vms.curmsg] = 1;
  3.2238 ++#else
  3.2239 ++				} else if (!cmd && (folder_int(vms.curbox) > 1  || box > 1)) {
  3.2240 ++					vms.deleted[vms.curmsg] = 1;  /* Enforce deletion after */
  3.2241 ++					deleted = 1;                  /* successful copy op */
  3.2242 + #endif
  3.2243 + 				} else {
  3.2244 + 					vms.deleted[vms.curmsg] = 0;
  3.2245 +@@ -8198,6 +8214,7 @@
  3.2246 + 	const char *imap_port;
  3.2247 + 	const char *imap_flags;
  3.2248 + 	const char *imap_folder;
  3.2249 ++	const char *imap_use_subfold;
  3.2250 + 	const char *auth_user;
  3.2251 + 	const char *auth_password;
  3.2252 + 	const char *expunge_on_hangup;
  3.2253 +@@ -8342,6 +8359,15 @@
  3.2254 + 		} else {
  3.2255 + 			ast_copy_string(imapfolder,"INBOX", sizeof(imapfolder));
  3.2256 + 		}
  3.2257 ++		/* IMAP saved (sub)folder location policy */
  3.2258 ++		if ((imap_use_subfold = ast_variable_retrieve(cfg, "general", "imapsubfold"))) {
  3.2259 ++			if (ast_false(imap_use_subfold))
  3.2260 ++				imapsubfold = 0;
  3.2261 ++			else
  3.2262 ++				imapsubfold = 1;
  3.2263 ++		} else {
  3.2264 ++			imapsubfold = 0;
  3.2265 ++		}
  3.2266 + 
  3.2267 + 		/* There is some very unorthodox casting done here. This is due
  3.2268 + 		 * to the way c-client handles the argument passed in. It expects a 

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/asterisk/asterisk.patch.parseavp	Mon Apr 27 12:19:05 2009 +0200
     4.3 @@ -0,0 +1,17 @@
     4.4 +Index: channels/chan_sip.c
     4.5 +diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
     4.6 +--- channels/chan_sip.c.orig	2009-04-24 00:54:30.000000000 +0200
     4.7 ++++ channels/chan_sip.c	2009-04-24 00:56:15.000000000 +0200
     4.8 +@@ -5214,8 +5214,10 @@
     4.9 + 
    4.10 + 		numberofports = 1;
    4.11 + 		len = -1;
    4.12 +-		if ((sscanf(m, "audio %d/%d RTP/AVP %n", &x, &numberofports, &len) == 2 && len > 0) ||
    4.13 +-		    (sscanf(m, "audio %d RTP/AVP %n", &x, &len) == 1 && len > 0)) {
    4.14 ++		if (((sscanf(m, "audio %d/%d RTP/AVP %n", &x, &numberofports, &len) == 2) && (len > 0)) ||
    4.15 ++			((sscanf(m, "audio %d/%d RTP/SAVP %n", &x, &numberofports, &len) == 2) && (len > 0)) ||
    4.16 ++			((sscanf(m, "audio %d RTP/AVP %n", &x, &len) == 1) && (len > 0)) ||
    4.17 ++			((sscanf(m, "audio %d RTP/SAVP %n", &x, &len) == 1) && (len > 0))) {
    4.18 + 			audio = TRUE;
    4.19 + 			numberofmediastreams++;
    4.20 + 			/* Found audio stream in this media definition */

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/asterisk/asterisk.patch.proxymwi	Mon Apr 27 12:19:05 2009 +0200
     5.3 @@ -0,0 +1,24 @@
     5.4 +Index: channels/chan_sip.c
     5.5 +diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
     5.6 +--- channels/chan_sip.c.orig	2009-04-24 00:51:58.000000000 +0200
     5.7 ++++ channels/chan_sip.c	2009-04-24 00:52:33.000000000 +0200
     5.8 +@@ -16428,6 +16428,7 @@
     5.9 + 	/* Called with peerl lock, but releases it */
    5.10 + 	struct sip_pvt *p;
    5.11 + 	int newmsgs, oldmsgs;
    5.12 ++	char *s = NULL;
    5.13 + 
    5.14 + 	/* Do we have an IP address? If not, skip this peer */
    5.15 + 	if (!peer->addr.sin_addr.s_addr && !peer->defaddr.sin_addr.s_addr) 
    5.16 +@@ -16461,6 +16462,11 @@
    5.17 + 		/* Recalculate our side, and recalculate Call ID */
    5.18 + 		if (ast_sip_ouraddrfor(&p->sa.sin_addr, &p->ourip))
    5.19 + 			p->ourip = __ourip;
    5.20 ++		/* Set the username = mailbox and remove the context */
    5.21 ++		ast_string_field_build(p, username, "%s", peer->name);
    5.22 ++		s = strchr(p->username, '@');
    5.23 ++		if (s != NULL)
    5.24 ++			*s = 0;
    5.25 + 		build_via(p);
    5.26 + 		build_callid_pvt(p);
    5.27 + 		/* Destroy this session after 32 secs */

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/asterisk/asterisk.patch.xfersips	Mon Apr 27 12:19:05 2009 +0200
     6.3 @@ -0,0 +1,36 @@
     6.4 +Index: channels/chan_sip.c
     6.5 +diff -Nau channels/chan_sip.c.orig channels/chan_sip.c
     6.6 +--- channels/chan_sip.c.orig	2009-04-24 00:48:57.000000000 +0200
     6.7 ++++ channels/chan_sip.c	2009-04-24 00:49:21.000000000 +0200
     6.8 +@@ -18771,6 +18771,7 @@
     6.9 + \todo	Fix this function so that we wait for reply to the REFER and
    6.10 + 	react to errors, denials or other issues the other end might have.
    6.11 +  */
    6.12 ++/* MSvB: Paramater dest may be SIPS encoded, having '@@' before host */
    6.13 + static int sip_sipredirect(struct sip_pvt *p, const char *dest)
    6.14 + {
    6.15 + 	char *cdest;
    6.16 +@@ -18780,7 +18781,7 @@
    6.17 + 	cdest = ast_strdupa(dest);
    6.18 + 	
    6.19 + 	extension = strsep(&cdest, "@");
    6.20 +-	host = strsep(&cdest, ":");
    6.21 ++	host = strsep(&cdest, ":");		/* MSvB: Could begin with '@' if SIPS */
    6.22 + 	port = strsep(&cdest, ":");
    6.23 + 	if (ast_strlen_zero(extension)) {
    6.24 + 		ast_log(LOG_ERROR, "Missing mandatory argument: extension\n");
    6.25 +@@ -18813,7 +18814,13 @@
    6.26 + 		}
    6.27 + 	}
    6.28 + 
    6.29 +-	ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s%s%s>", extension, host, port ? ":" : "", port ? port : "");
    6.30 ++	if (host && *host == '@') {
    6.31 ++		ast_log(LOG_DEBUG, "Decoding TLS incapable Asterisk SIP URI to a standard SIPS URI before redirecting via 302 Moved Temporarily\n");
    6.32 ++		ast_string_field_build(p, our_contact, "Transfer <sips:%s@%s%s%s>", extension, host + 1, port ? ":" : "", port ? port : "");
    6.33 ++    }
    6.34 ++	else
    6.35 ++		ast_string_field_build(p, our_contact, "Transfer <sip:%s@%s%s%s>", extension, host, port ? ":" : "", port ? port : "");
    6.36 ++
    6.37 + 	transmit_response_reliable(p, "302 Moved Temporarily", &p->initreq);
    6.38 + 
    6.39 + 	sip_scheddestroy(p, SIP_TRANS_TIMEOUT);	/* Make sure we stop send this reply. */

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/asterisk/asterisk.spec	Mon Apr 27 12:19:05 2009 +0200
     7.3 @@ -0,0 +1,544 @@
     7.4 +##
     7.5 +##  asterisk.spec -- OpenPKG RPM Package Specification
     7.6 +##  Copyright (c) 2000-2007 OpenPKG Foundation e.V. <http://openpkg.net/>
     7.7 +##  Copyright (c) 2000-2007 Ralf S. Engelschall <http://engelschall.com/>
     7.8 +##
     7.9 +##  Permission to use, copy, modify, and distribute this software for
    7.10 +##  any purpose with or without fee is hereby granted, provided that
    7.11 +##  the above copyright notice and this permission notice appear in all
    7.12 +##  copies.
    7.13 +##
    7.14 +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
    7.15 +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
    7.16 +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
    7.17 +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
    7.18 +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
    7.19 +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
    7.20 +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
    7.21 +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
    7.22 +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
    7.23 +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
    7.24 +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
    7.25 +##  SUCH DAMAGE.
    7.26 +##
    7.27 +
    7.28 +#   package component versions
    7.29 +%define       V_langsounds    1.4.12
    7.30 +%define       V_extrasounds   1.4.9
    7.31 +%define       V_amoomasounds  1.4
    7.32 +%define       V_customsounds  1.0
    7.33 +%define       V_chan_capi     1.1.2
    7.34 +
    7.35 +#   package information
    7.36 +Name:         asterisk
    7.37 +Summary:      Private Branch Exchange (PBX) for VoIP
    7.38 +URL:          http://www.asterisk.org/
    7.39 +Vendor:       Mark Spencer et al.
    7.40 +Packager:     Michael Schloh von Bennewitz
    7.41 +Distribution: Michael Schloh von Bennewitz
    7.42 +Class:        EVAL
    7.43 +Group:        VoIP
    7.44 +License:      GPL
    7.45 +Version:      1.4.24.1
    7.46 +Release:      20090422
    7.47 +
    7.48 +#   package options
    7.49 +%option       with_libpri     yes
    7.50 +%option       with_xfersips   yes
    7.51 +%option       with_proxymwi   yes
    7.52 +%option       with_parseavp   yes
    7.53 +%option       with_radius     no
    7.54 +%option       with_sqlite     no
    7.55 +%option       with_pgsql      no
    7.56 +%option       with_curl       no
    7.57 +%option       with_imap       no
    7.58 +%option       with_astman     no
    7.59 +%option       with_capi       no
    7.60 +%option       with_zaptel     no
    7.61 +%option       with_smdipoll   10
    7.62 +
    7.63 +#   list of sources
    7.64 +Source0:      http://downloads.digium.com/pub/asterisk/releases/asterisk-%{version}.tar.gz
    7.65 +Source1:      ftp://ftp.chan-capi.org/chan-capi/chan_capi-%{V_chan_capi}.tar.gz
    7.66 +Source2:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-alaw.tar.gz
    7.67 +Source3:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g722.tar.gz
    7.68 +Source4:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-g729.tar.gz
    7.69 +Source5:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-gsm.tar.gz
    7.70 +Source6:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-moh-freeplay-ulaw.tar.gz
    7.71 +Source7:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-alaw-%{V_extrasounds}.tar.gz
    7.72 +Source8:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g722-%{V_extrasounds}.tar.gz
    7.73 +Source9:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-g729-%{V_extrasounds}.tar.gz
    7.74 +Source10:      http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-gsm-%{V_extrasounds}.tar.gz
    7.75 +Source11:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extra-sounds-en-ulaw-%{V_extrasounds}.tar.gz
    7.76 +Source12:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-alaw-%{V_langsounds}.tar.gz
    7.77 +Source13:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g722-%{V_langsounds}.tar.gz
    7.78 +Source14:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-g729-%{V_langsounds}.tar.gz
    7.79 +Source15:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-gsm-%{V_langsounds}.tar.gz
    7.80 +Source16:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-en-ulaw-%{V_langsounds}.tar.gz
    7.81 +Source17:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-alaw-%{V_langsounds}.tar.gz
    7.82 +Source18:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g722-%{V_langsounds}.tar.gz
    7.83 +Source19:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-g729-%{V_langsounds}.tar.gz
    7.84 +Source20:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-gsm-%{V_langsounds}.tar.gz
    7.85 +Source21:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-es-ulaw-%{V_langsounds}.tar.gz
    7.86 +Source22:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-alaw-%{V_langsounds}.tar.gz
    7.87 +Source23:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g722-%{V_langsounds}.tar.gz
    7.88 +Source24:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-g729-%{V_langsounds}.tar.gz
    7.89 +Source25:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-gsm-%{V_langsounds}.tar.gz
    7.90 +Source26:     http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-core-sounds-fr-ulaw-%{V_langsounds}.tar.gz
    7.91 +Source27:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-%{V_amoomasounds}-de-prompts.tar.gz
    7.92 +Source28:     http://www.amooma.de/asterisk/sprachbausteine/asterisk-core-sounds-de-gsm-current.tar.gz
    7.93 +Source29:     ftp://ftp.europalab.com/pub/sfw/machsnds/de-digits/de-digits-%{V_customsounds}.tar.bz2
    7.94 +Source30:     asterisk.conf
    7.95 +Source31:     amd.conf
    7.96 +Source32:     capi.conf
    7.97 +Source33:     cdr.conf
    7.98 +Source34:     cdr_custom.conf
    7.99 +Source35:     codecs.conf
   7.100 +Source36:     dundi.conf
   7.101 +Source37:     enum.conf
   7.102 +Source38:     extensions.conf
   7.103 +Source39:     features.conf
   7.104 +Source40:     festival.conf
   7.105 +Source41:     followme.conf
   7.106 +Source42:     indications.conf
   7.107 +Source33:     logger.conf
   7.108 +Source34:     manager.conf
   7.109 +Source45:     meetme.conf
   7.110 +Source46:     misdn.conf
   7.111 +Source47:     modules.conf
   7.112 +Source48:     musiconhold.conf
   7.113 +Source49:     privacy.conf
   7.114 +Source50:     rpt.conf
   7.115 +Source51:     rtp.conf
   7.116 +Source52:     say.conf
   7.117 +Source53:     sip.conf
   7.118 +Source54:     sip_notify.conf
   7.119 +Source55:     sla.conf
   7.120 +Source56:     voicemail.conf
   7.121 +Source57:     zapata.conf
   7.122 +Source58:     rc.asterisk
   7.123 +Source59:     wakeup.agi
   7.124 +Patch0:       asterisk.patch
   7.125 +Patch1:       asterisk.patch.xfersips
   7.126 +Patch2:       asterisk.patch.proxymwi
   7.127 +Patch3:       asterisk.patch.parseavp
   7.128 +
   7.129 +#   build information
   7.130 +Prefix:       %{l_prefix}
   7.131 +BuildRoot:    %{l_buildroot}
   7.132 +BuildPreReq:  OpenPKG, openpkg >= 20040130, pkgconfig, awk, grep
   7.133 +PreReq:       OpenPKG, openpkg >= 20040130
   7.134 +BuildPreReq:  ncurses, openssl, zlib
   7.135 +PreReq:       ncurses, openssl, zlib
   7.136 +BuildPreReq:  speex, vorbis-libs, sox
   7.137 +PreReq:       speex, vorbis-libs, sox
   7.138 +%if "%{with_libpri}" == "yes"
   7.139 +BuildPreReq:  libpri
   7.140 +PreReq:       libpri
   7.141 +%endif
   7.142 +%if "%{with_radius}" == "yes"
   7.143 +BuildPreReq:  radiusclient
   7.144 +PreReq:       radiusclient
   7.145 +%endif
   7.146 +%if "%{with_sqlite}" == "yes"
   7.147 +BuildPreReq:  sqlite
   7.148 +PreReq:       sqlite
   7.149 +%endif
   7.150 +%if "%{with_pgsql}" == "yes"
   7.151 +BuildPreReq:  postgresql
   7.152 +PreReq:       postgresql
   7.153 +%endif
   7.154 +%if "%{with_curl}" == "yes"
   7.155 +BuildPreReq:  curl
   7.156 +PreReq:       curl
   7.157 +%endif
   7.158 +%if "%{with_imap}" == "yes"
   7.159 +BuildPreReq:  imap
   7.160 +PreReq:       imap
   7.161 +%endif
   7.162 +%if "%{with_astman}" == "yes"
   7.163 +BuildPreReq:  newt
   7.164 +PreReq:       newt
   7.165 +%endif
   7.166 +AutoReq:      no
   7.167 +AutoReqProv:  no
   7.168 +
   7.169 +%description
   7.170 +    Asterisk is a complete Private Branch Exchange (PBX) in software.
   7.171 +    It provides all of the features you would expect from a PBX and
   7.172 +    more. Asterisk does Voice over IP (VoIP) in many protocols. Asterisk
   7.173 +    provides Voicemail services with Directory, Call Conferencing,
   7.174 +    Interactive Voice Response and Call Queuing. It has support for
   7.175 +    three-way calling, caller ID services, ADSI, SIP, etc. Asterisk
   7.176 +    needs no additional hardware for VoIP.
   7.177 +
   7.178 +    This copy of Asterisk is optionally patched to allow the asterisk
   7.179 +    server to respond to SIP/TLS transfer requests using the Transfer()
   7.180 +    application. Should this option be chosen, the asterisk server
   7.181 +    successfully dispatches all transfer destinations using 'SIPS'
   7.182 +    technology by means of the standard SIP/2.0 302 Moved Temporarily
   7.183 +    message, with a URI resembling <sips:extension@hostname.tld:port>.
   7.184 +
   7.185 +    This copy of Asterisk is optionally patched as well to enclose the
   7.186 +    correct user name in NOTIFY messages when MWI logic detects changes
   7.187 +    in the state of Messages-Waiting. Asterisk will send NOTIFY messages
   7.188 +    with the URI 'user@hostname' instead of simply 'hostname'. This can
   7.189 +    be used by a external SIP proxy to route the MWI to the correct phone.
   7.190 +
   7.191 +%track
   7.192 +    prog asterisk = {
   7.193 +        version   = %{version}
   7.194 +        url       = http://downloads.digium.com/pub/asterisk/releases/
   7.195 +        regex     = asterisk-(__VER__)\.tar\.gz
   7.196 +    }
   7.197 +
   7.198 +%prep
   7.199 +    %setup -q -n asterisk-%{version}
   7.200 +    %setup -q -n asterisk-%{version} -D -T -a 1
   7.201 +    %patch -p0
   7.202 +%if "%{with_xfersips}" == "yes"
   7.203 +    %patch -p0 -P 1
   7.204 +%endif
   7.205 +%if "%{with_proxymwi}" == "yes"
   7.206 +    %patch -p0 -P 2
   7.207 +%endif
   7.208 +%if "%{with_parseavp}" == "yes"
   7.209 +    %patch -p0 -P 3
   7.210 +%endif
   7.211 +
   7.212 +    #   link install-sh to where Makefiles expect it
   7.213 +    for dir in agi utils res channels pbx apps codecs formats cdr funcs main; do
   7.214 +        ( cd $dir && ln -s ../install-sh ) || exit $?
   7.215 +    done
   7.216 +
   7.217 +    #   apply corrections
   7.218 +    case "%{l_platform -t}" in
   7.219 +        *-sunos* )
   7.220 +            %{l_shtool} subst \
   7.221 +                -e 's|\(tmp->tm_gmtoff = ttisp->tt_gmtoff;\)|/*\1*/|' \
   7.222 +                main/stdtime/localtime.c
   7.223 +            ;;
   7.224 +    esac
   7.225 +    %{l_shtool} subst \
   7.226 +        -e 's;sysconfdir=/etc;true;' \
   7.227 +        -e 's;mandir=/usr/share/man;true;' \
   7.228 +        -e 's;localstatedir=/var;true;' \
   7.229 +        -e 's;\(radiusclient\)-ng;\1;g' \
   7.230 +        -e 's;\(\-lsqlite\);\13;g' \
   7.231 +        -e 's;\(sqlite\)\(\.h\);\13\2;g' \
   7.232 +        -e 's;\(sqlite\)\(_exec\);\13\2;g' \
   7.233 +        -e 's;^\(LIBS="-lvorbis\);\1 ${OGG_LIB};' \
   7.234 +        -e 's;\(#include <\${NCURSES_DIR}/include\);\1/ncurses;' \
   7.235 +        -e 's;-I${IMAP_TK_DIR}/c-client;-I${IMAP_TK_DIR}/include/imap;g' \
   7.236 +        -e 's;${IMAP_TK_DIR}/c-client/c-client\.a;-limap -lssl -lcrypto -lcrypt;g' \
   7.237 +        configure
   7.238 +    %{l_shtool} subst \
   7.239 +        -e 's; *-I/usr/local/ssl/include;;g' \
   7.240 +        -e 's;/opt/ssl/include;%{l_prefix}/include;g' \
   7.241 +        -e 's;/usr/local;%{l_prefix};g' \
   7.242 +        -e 's;^\(MOD_SUBDIR_CFLAGS=.*\ *\)$;\1 -I%{l_prefix}/include;' \
   7.243 +        -e 's;^\( *ASTETCDIR\)=.*;\1=$(sysconfdir)/asterisk;g' \
   7.244 +        -e 's;^\( *ASTLIBDIR\)=.*;\1=$(libdir)/asterisk;g' \
   7.245 +        -e 's;^\( *ASTHEADERDIR\)=.*;\1=$(includedir)/asterisk;g' \
   7.246 +        -e 's;^\( *ASTBINDIR\)=.*;\1=$(bindir);g' \
   7.247 +        -e 's;^\( *ASTSBINDIR\)=.*;\1=$(sbindir);g' \
   7.248 +        -e 's;^\( *ASTSPOOLDIR\)=.*;\1=$(localstatedir)/asterisk/spool;g' \
   7.249 +        -e 's;^\( *ASTLOGDIR\)=.*;\1=$(localstatedir)/asterisk/log;g' \
   7.250 +        -e 's;^\( *ASTVARRUNDIR\)=.*;\1=$(localstatedir)/asterisk/run;g' \
   7.251 +        -e 's;^\( *ASTMANDIR\)=.*;\1=$(mandir);g' \
   7.252 +        -e 's;^\( *ASTVARLIBDIR\)=.*;\1=$(localstatedir)/asterisk/lib;g' \
   7.253 +        -e 's;^\( *ASTVARRUNDIR\)=.*;\1=$(localstatedir)/asterisk/run;g' \
   7.254 +        -e 's;^\( *ASTDATADIR\):*=.*;\1=$(datadir)/asterisk;g' \
   7.255 +        -e 's/\(for f in\) \(\$(OLDMODS); do \\\)$/\1 "warning:" \2/' \
   7.256 +        Makefile
   7.257 +        #-e 's;\(ASTSPOOLDIR=\$(localstatedir)\)\(/spool\)\(/asterisk\);\1\3\2;' \
   7.258 +        #-e 's;\(ASTLOGDIR=\$(localstatedir)\)\(/log\)\(/asterisk\);\1\3\2;' \
   7.259 +        #-e 's;\(ASTVARRUNDIR=\$(localstatedir)\)\(/run\);\1/asterisk\2;' \
   7.260 +        #-e 's;\(ASTVARRUNDIR=\$(localstatedir)\)\(/run\)\(/asterisk\);\1\3\2;' \
   7.261 +        #-e 's;\(ASTVARLIBDIR=\$(localstatedir)\)\(/lib\)\(/asterisk\);\1\3\2;' \
   7.262 +        #-e 's;\(ASTDATADIR:=\)\$(ASTVARLIBDIR);\1$(prefix)/share/asterisk;' \
   7.263 +        #Makefile
   7.264 +    %{l_shtool} subst \
   7.265 +        -e 's; *-L/usr/local/ssl/lib;;g' \
   7.266 +        -e 's;/opt/ssl/lib;%{l_prefix}/lib;g' \
   7.267 +        -e 's;/usr/local;%{l_prefix};g' \
   7.268 +        -e 's;\(ASTLINK=\)$;\1-Wl,--export-dynamic;g' \
   7.269 +        main/Makefile
   7.270 +    %{l_shtool} subst \
   7.271 +        -e 's;LOG_WARNING\(, "Failed to perform seek\);LOG_DEBUG\1;g' \
   7.272 +        main/channel.c
   7.273 +    %{l_shtool} subst \
   7.274 +        -e 's;LOG_WARNING\(, "[^ ][^ ]* is not supported\);LOG_DEBUG\1;g' \
   7.275 +        formats/format_ogg_vorbis.c
   7.276 +    %{l_shtool} subst \
   7.277 +        -e 's;\(/etc/radiusclient-ng/radiusclient.conf\);%{l_prefix}\1;g' \
   7.278 +        -e 's;\(radiusclient\)-ng;\1;g' \
   7.279 +        cdr/cdr_radius.c
   7.280 +    %{l_shtool} subst \
   7.281 +        -e 's;\(sqlite\)\(\.h\);\13\2;g' \
   7.282 +        cdr/cdr_sqlite.c
   7.283 +    %{l_shtool} subst \
   7.284 +        -e 's;\(#define DEFAULT_POLLING_INTERVAL\)  *.*;\1 %{with_smdipoll};' \
   7.285 +        res/res_smdi.c
   7.286 +    %{l_shtool} subst \
   7.287 +        -e 's;\(ASTERISK_HEADER_DIR=\).*;\1%{l_prefix}/include;g' \
   7.288 +        -e 's;\(MODULES_DIR=\).*;\1%{l_prefix}/lib/asterisk/modules;g' \
   7.289 +        -e 's;\(CONFIG_DIR=\).*;\1%{l_prefix}/etc/asterisk;g' \
   7.290 +        -e 's;\(\$(MODULES_DIR)\);$(DESTDIR)\1;g' \
   7.291 +        -e 's;\${CONFIG_DIR};$(DESTDIR)$(CONFIG_DIR);g' \
   7.292 +        chan_capi-%{V_chan_capi}/Makefile
   7.293 +
   7.294 +#    #   optionally specify CPU
   7.295 +#    %{l_shtool} subst \
   7.296 +#        -e 's;build_cpu=\$1;build_cpu=i586;' \
   7.297 +#        -e 's;host_cpu=\$1;host_cpu=i586;' \
   7.298 +#        configure
   7.299 +
   7.300 +%build
   7.301 +    #   apply platform build rules
   7.302 +    libs="`pkg-config openssl speex --libs-only-l`"
   7.303 +%if "%{with_curl}" == "yes"
   7.304 +    libs="$libs `pkg-config libcurl --libs-only-l`"
   7.305 +%endif
   7.306 +%if "%{with_sqlite}" == "yes"
   7.307 +    libs="$libs `pkg-config sqlite3 --libs-only-l`"
   7.308 +%endif
   7.309 +%if "%{with_pgsql}" == "yes"
   7.310 +    libs="-lpq $libs"
   7.311 +%endif
   7.312 +%if "%{with_radius}" == "yes"
   7.313 +    libs="$libs -lradiusclient"
   7.314 +%endif
   7.315 +%if "%{with_libpri}" == "yes"
   7.316 +    libs="$libs -lpri"
   7.317 +%endif
   7.318 +    case "%{l_platform -t}" in
   7.319 +        *-linux*    ) libs="$libs -lrt" ;;
   7.320 +        *-sunos*    ) libs="$libs -lrt" ;;
   7.321 +    esac
   7.322 +
   7.323 +    #   configure package
   7.324 +    CC="%{l_cc}" \
   7.325 +    CFLAGS="%{l_cflags -O}" \
   7.326 +%if "%{with_imap}" == "yes"
   7.327 +    CPPFLAGS="%{l_cppflags imap ncurses}" \
   7.328 +%else
   7.329 +    CPPFLAGS="%{l_cppflags ncurses}" \
   7.330 +%endif
   7.331 +    LDFLAGS="%{l_ldflags}" \
   7.332 +    LIBS="$libs" \
   7.333 +    ./configure \
   7.334 +        --prefix=%{l_prefix} \
   7.335 +        --mandir=%{l_prefix}/man \
   7.336 +        --with-ncurses=%{l_prefix} \
   7.337 +%if "%{with_libpri}" == "yes"
   7.338 +        --with-pri=%{l_prefix} \
   7.339 +%else
   7.340 +        --with-pri=no \
   7.341 +%endif
   7.342 +        --with-ssl=%{l_prefix} \
   7.343 +%if "%{with_radius}" == "yes"
   7.344 +        --with-radius=%{l_prefix} \
   7.345 +%else
   7.346 +        --with-radius=no \
   7.347 +%endif
   7.348 +%if "%{with_sqlite}" == "yes"
   7.349 +        --with-sqlite=%{l_prefix} \
   7.350 +%else
   7.351 +        --with-sqlite=no \
   7.352 +%endif
   7.353 +%if "%{with_postgresql}" == "yes"
   7.354 +        --with-postgres=%{l_prefix} \
   7.355 +%else
   7.356 +        --with-postgres=no \
   7.357 +%endif
   7.358 +%if "%{with_curl}" == "yes"
   7.359 +        --with-curl=%{l_prefix} \
   7.360 +%else
   7.361 +        --with-curl=no \
   7.362 +%endif
   7.363 +%if "%{with_imap}" == "yes"
   7.364 +        --with-imap=%{l_prefix} \
   7.365 +        --disable-largefile \
   7.366 +%else
   7.367 +        --with-imap=no \
   7.368 +%endif
   7.369 +%if "%{with_astman}" == "yes"
   7.370 +        --with-newt=%{l_prefix} \
   7.371 +%else
   7.372 +        --with-newt=no \
   7.373 +%endif
   7.374 +        --with-speex=%{l_prefix} \
   7.375 +        --with-speexdsp=%{l_prefix} \
   7.376 +        --with-ogg=%{l_prefix} \
   7.377 +        --with-vorbis=%{l_prefix} \
   7.378 +        --with-z=%{l_prefix}
   7.379 +
   7.380 +    #   build package
   7.381 +    %{l_make} %{l_mflags -O} menuselect/menuselect menuselect-tree
   7.382 +    menuselect/menuselect --check-deps menuselect.makeopts
   7.383 +    %{l_shtool} subst \
   7.384 +        -e 's;\(MENUSELECT_MOH=\).*;\1;' \
   7.385 +        -e 's;\(MENUSELECT_CORE_SOUNDS=\).*;\1;' \
   7.386 +        -e 's;\(MENUSELECT_EXTRA_SOUNDS=\).*;\1;' \
   7.387 +        menuselect.makeopts
   7.388 +%if "%{with_imap}" == "yes"
   7.389 +    %{l_shtool} subst \
   7.390 +        -e 's;\(MENUSELECT_OPTS_app_voicemail=\)$;\1IMAP_STORAGE;' \
   7.391 +        menuselect.makeopts
   7.392 +%endif
   7.393 +    %{l_make} %{l_mflags -O} EXTLIBS="$libs" NOISY_BUILD=yes
   7.394 +%if "%{with_capi}" == "yes"
   7.395 +    ( cd chan_capi-%{V_chan_capi}
   7.396 +      %{l_make} %{l_mflags -O}
   7.397 +    ) || exit $?
   7.398 +%endif
   7.399 +
   7.400 +%install
   7.401 +    rm -rf $RPM_BUILD_ROOT
   7.402 +
   7.403 +    #   install package
   7.404 +    %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
   7.405 +%if "%{with_capi}" == "yes"
   7.406 +    ( cd chan_capi-%{V_chan_capi}
   7.407 +      %{l_make} %{l_mflags} install samples DESTDIR=$RPM_BUILD_ROOT
   7.408 +    ) || exit $?
   7.409 +%endif
   7.410 +
   7.411 +    #   install all sound prompt files
   7.412 +    for codec in alaw ulaw g722 g729 gsm; do
   7.413 +        for lang in es fr; do
   7.414 +            ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/${lang}
   7.415 +              %{l_tar} zxf %{_sourcedir}/asterisk-core-sounds-${lang}-${codec}-%{V_langsounds}.tar.gz
   7.416 +            ) || exit $?
   7.417 +        done
   7.418 +        ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds
   7.419 +          %{l_tar} zxf %{_sourcedir}/asterisk-extra-sounds-en-${codec}-%{V_extrasounds}.tar.gz
   7.420 +          %{l_tar} zxf %{_sourcedir}/asterisk-core-sounds-en-${codec}-%{V_langsounds}.tar.gz
   7.421 +        ) || exit $?
   7.422 +    done
   7.423 +
   7.424 +    #   install special case sound files
   7.425 +    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds
   7.426 +      %{l_tar} jxf %{SOURCE de-digits-%{V_customsounds}.tar.bz2}
   7.427 +      %{l_tar} zxf %{SOURCE asterisk-core-sounds-de-gsm-current.tar.gz}
   7.428 +      cd de
   7.429 +      %{l_tar} zxf %{_sourcedir}/asterisk-%{V_amoomasounds}-de-prompts.tar.gz
   7.430 +      mv -f de/* . && rm -rf de
   7.431 +      mv -f dictate/de/* letters/ && rm -rf dictate/de
   7.432 +      mv -f digits/de/* letters/ && rm -rf digits/de
   7.433 +      mv -f letters/de/* letters/ && rm -rf letters/de
   7.434 +      mv -f phonetic/de/* letters/ && rm -rf phonetic/de
   7.435 +    ) || exit $?
   7.436 +
   7.437 +    #   install additional music on hold files
   7.438 +    ( cd $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/moh
   7.439 +      for codec in alaw ulaw g722 g729 gsm; do
   7.440 +          %{l_tar} zxf %{_sourcedir}/asterisk-moh-freeplay-${codec}.tar.gz
   7.441 +      done
   7.442 +    ) || exit $?
   7.443 +
   7.444 +#    #   install nonstandard voicemail prompts
   7.445 +#    %{l_shtool} mkdir -f -p -m 755 \
   7.446 +#        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/voicemail/default/%{exten}/unavail
   7.447 +#    %{l_shtool} install -c -m 660 \
   7.448 +#        %{_sourcedir}/ansage-%{V_ansage}.wav} \
   7.449 +#        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/voicemail/default/%{exten}/unavail.wav
   7.450 +
   7.451 +    #   install default configuration
   7.452 +    %{l_shtool} install -c -m 660 %{l_value -s -a} \
   7.453 +        %{SOURCE asterisk.conf} \
   7.454 +        %{SOURCE amd.conf} \
   7.455 +        %{SOURCE cdr.conf} \
   7.456 +        %{SOURCE codecs.conf} \
   7.457 +        %{SOURCE extensions.conf} \
   7.458 +        %{SOURCE features.conf} \
   7.459 +        %{SOURCE festival.conf} \
   7.460 +        %{SOURCE followme.conf} \
   7.461 +        %{SOURCE indications.conf} \
   7.462 +        %{SOURCE logger.conf} \
   7.463 +        %{SOURCE manager.conf} \
   7.464 +        %{SOURCE meetme.conf} \
   7.465 +        %{SOURCE modules.conf} \
   7.466 +        %{SOURCE musiconhold.conf} \
   7.467 +        %{SOURCE rtp.conf} \
   7.468 +        %{SOURCE sip.conf} \
   7.469 +        %{SOURCE sla.conf} \
   7.470 +        %{SOURCE voicemail.conf} \
   7.471 +        %{SOURCE zapata.conf} \
   7.472 +        $RPM_BUILD_ROOT%{l_prefix}/etc/asterisk/
   7.473 +
   7.474 +    #   install runcommand script
   7.475 +    %{l_shtool} mkdir -f -p -m 755 \
   7.476 +        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
   7.477 +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
   7.478 +        %{SOURCE rc.asterisk} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
   7.479 +
   7.480 +    #   install additional AGI scripts
   7.481 +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
   7.482 +        %{SOURCE wakeup.agi} $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin/
   7.483 +
   7.484 +    #   correct installation hierarchy
   7.485 +    %{l_shtool} mkdir -f -p -m 755 \
   7.486 +        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/lib \
   7.487 +        $RPM_BUILD_ROOT%{l_prefix}/var/asterisk/spool/outgoing
   7.488 +
   7.489 +    #   remove unused components
   7.490 +    rm -rf \
   7.491 +        $RPM_BUILD_ROOT%{l_prefix}/bin \
   7.492 +        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/images \
   7.493 +        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/de/.DS_Store \
   7.494 +        $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/sounds/de/autogen.sh \
   7.495 +        >/dev/null 2>&1 || true
   7.496 +
   7.497 +    #   adjust inconsistent names
   7.498 +    for bin in $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin/*.*; do
   7.499 +        mv $bin `echo $bin | sed -e 's;\.[^.]*$;;'`
   7.500 +    done
   7.501 +
   7.502 +    #   strip down installation
   7.503 +    strip $RPM_BUILD_ROOT%{l_prefix}/bin/* \
   7.504 +          $RPM_BUILD_ROOT%{l_prefix}/sbin/* \
   7.505 +          $RPM_BUILD_ROOT%{l_prefix}/lib/asterisk/modules/* \
   7.506 +          $RPM_BUILD_ROOT%{l_prefix}/share/asterisk/agi-bin/* \
   7.507 +          >/dev/null 2>&1 || true
   7.508 +
   7.509 +    #   determine installation files
   7.510 +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} \
   7.511 +        '%config %attr(660,%{l_musr},%{l_rgrp}) %{l_prefix}/etc/asterisk/*' \
   7.512 +        '%config %attr(644,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/*' \
   7.513 +        '%config %attr(755,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/dictate' \
   7.514 +        '%config %attr(755,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/digits' \
   7.515 +        '%config %attr(755,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/followme' \
   7.516 +        '%config %attr(755,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/letters' \
   7.517 +        '%config %attr(755,%{l_musr},%{l_mgrp}) %{l_prefix}/share/asterisk/sounds/de/phonetic' \
   7.518 +        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk/*' \
   7.519 +        '%attr(-,%{l_rusr},%{l_rgrp}) %{l_prefix}/var/asterisk/*/*'
   7.520 +
   7.521 +%files -f files
   7.522 +
   7.523 +%clean
   7.524 +    rm -rf $RPM_BUILD_ROOT
   7.525 +
   7.526 +%post
   7.527 +    #   after upgrade, restart service
   7.528 +    [ $1 -eq 2 ] || exit 0
   7.529 +    eval `%{l_rc} asterisk status 2>/dev/null`
   7.530 +    [ ".$asterisk_active" = .yes ] && %{l_rc} asterisk restart
   7.531 +    exit 0
   7.532 +
   7.533 +%preun
   7.534 +    #   before erase, stop service and remove log files
   7.535 +    [ $1 -eq 0 ] || exit 0
   7.536 +    %{l_rc} asterisk stop 2>/dev/null
   7.537 +    rm  -f $RPM_INSTALL_PREFIX/var/asterisk/lib/*       >/dev/null 2>&1 || true
   7.538 +    rm  -f $RPM_INSTALL_PREFIX/var/asterisk/log/*       >/dev/null 2>&1 || true
   7.539 +    rm  -f $RPM_INSTALL_PREFIX/var/asterisk/log/cdr-*/* >/dev/null 2>&1 || true
   7.540 +    rm  -f $RPM_INSTALL_PREFIX/var/asterisk/run/*       >/dev/null 2>&1 || true
   7.541 +    for deldir in meetme outgoing system tmp; do
   7.542 +        rm -rf \
   7.543 +            $RPM_INSTALL_PREFIX/var/asterisk/spool/$deldir \
   7.544 +            >/dev/null 2>&1 || true
   7.545 +    done
   7.546 +    exit 0
   7.547 +

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/asterisk/capi.conf	Mon Apr 27 12:19:05 2009 +0200
     8.3 @@ -0,0 +1,34 @@
     8.4 +;;
     8.5 +;;  capi.conf -- Asterisk ISDN/CAPI channel configuration
     8.6 +;;
     8.7 +
     8.8 +;[general]
     8.9 +;nationalprefix        = 0
    8.10 +;internationalprefix   = 00
    8.11 +;rxgain                = 1.0
    8.12 +;txgain                = 1.0
    8.13 +;ulaw                  = no
    8.14 +;debug                 = yes
    8.15 +
    8.16 +;[ISDN1]
    8.17 +;isdnmode              = msn
    8.18 +;incomingmsn           = *
    8.19 +;controller            = 0
    8.20 +;group                 = 1
    8.21 +;;prefix                = 0
    8.22 +;softdtmf              = off
    8.23 +;relaxdtmf             = off
    8.24 +;accountcode           =
    8.25 +;context               = external
    8.26 +;holdtype              = local
    8.27 +;immediate             = yes
    8.28 +;echocancel            = no
    8.29 +;echosquelch           = no
    8.30 +;echotail              = 64
    8.31 +;bridge                = yes
    8.32 +;callgroup             = 1
    8.33 +;deflect               = 1234567
    8.34 +;devices               = 2
    8.35 +;wait_silence_samples  = 1000
    8.36 +;dtmf_generate         = yes
    8.37 +

     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/asterisk/cdr.conf	Mon Apr 27 12:19:05 2009 +0200
     9.3 @@ -0,0 +1,148 @@
     9.4 +;
     9.5 +; Asterisk Call Detail Record engine configuration
     9.6 +;
     9.7 +; CDR is Call Detail Record, which provides logging services via a variety of
     9.8 +; pluggable backend modules.  Detailed call information can be recorded to
     9.9 +; databases, files, etc.  Useful for billing, fraud prevention, compliance with
    9.10 +; Sarbanes-Oxley aka The Enron Act, QOS evaluations, and more.
    9.11 +;
    9.12 +
    9.13 +;[general]
    9.14 +
    9.15 +; Define whether or not to use CDR logging.  Setting this to "no" will override
    9.16 +; any loading of backend CDR modules.  Default is "yes".
    9.17 +;enable=yes
    9.18 +
    9.19 +; Define whether or not to log unanswered calls. Setting this to "yes" will
    9.20 +; report every attempt to ring a phone in dialing attempts, when it was not 
    9.21 +; answered. For example, if you try to dial 3 extensions, and this option is "yes",
    9.22 +; you will get 3 CDR's, one for each phone that was rung. Default is "no". Some
    9.23 +; find this information horribly useless. Others find it very valuable. Note, in "yes"
    9.24 +; mode, you will see one CDR, with one of the call targets on one side, and the originating
    9.25 +; channel on the other, and then one CDR for each channel attempted. This may seem 
    9.26 +; redundant, but cannot be helped.
    9.27 +;unanswered = no
    9.28 +
    9.29 +; Define the CDR batch mode, where instead of posting the CDR at the end of
    9.30 +; every call, the data will be stored in a buffer to help alleviate load on the
    9.31 +; asterisk server.  Default is "no".
    9.32 +;
    9.33 +; WARNING WARNING WARNING
    9.34 +; Use of batch mode may result in data loss after unsafe asterisk termination
    9.35 +; ie. software crash, power failure, kill -9, etc.
    9.36 +; WARNING WARNING WARNING
    9.37 +;
    9.38 +;batch=no
    9.39 +
    9.40 +; Define the maximum number of CDRs to accumulate in the buffer before posting
    9.41 +; them to the backend engines.  'batch' must be set to 'yes'.  Default is 100.
    9.42 +;size=100
    9.43 +
    9.44 +; Define the maximum time to accumulate CDRs in the buffer before posting them
    9.45 +; to the backend engines.  If this time limit is reached, then it will post the
    9.46 +; records, regardless of the value defined for 'size'.  'batch' must be set to
    9.47 +; 'yes'.  Note that time is in seconds.  Default is 300 (5 minutes).
    9.48 +;time=300
    9.49 +
    9.50 +; The CDR engine uses the internal asterisk scheduler to determine when to post
    9.51 +; records.  Posting can either occur inside the scheduler thread, or a new
    9.52 +; thread can be spawned for the submission of every batch.  For small batches,
    9.53 +; it might be acceptable to just use the scheduler thread, so set this to "yes".
    9.54 +; For large batches, say anything over size=10, a new thread is recommended, so
    9.55 +; set this to "no".  Default is "no".
    9.56 +;scheduleronly=no
    9.57 +
    9.58 +; When shutting down asterisk, you can block until the CDRs are submitted.  If
    9.59 +; you don't, then data will likely be lost.  You can always check the size of
    9.60 +; the CDR batch buffer with the CLI "cdr status" command.  To enable blocking on
    9.61 +; submission of CDR data during asterisk shutdown, set this to "yes".  Default
    9.62 +; is "yes".
    9.63 +;safeshutdown=yes
    9.64 +
    9.65 +; Normally, CDR's are not closed out until after all extensions are finished
    9.66 +; executing.  By enabling this option, the CDR will be ended before executing
    9.67 +; the "h" extension so that CDR values such as "end" and "billsec" may be
    9.68 +; retrieved inside of of this extension.
    9.69 +;endbeforehexten=no
    9.70 +
    9.71 +;
    9.72 +;
    9.73 +; CHOOSING A CDR "BACKEND"  (what kind of output to generate)
    9.74 +;
    9.75 +; To choose a backend, you have to make sure either the right category is 
    9.76 +; defined in this file, or that the appropriate config file exists, and has the 
    9.77 +; proper definitions in it. If there are any problems, usually, the entry will
    9.78 +; silently ignored, and you get no output.
    9.79 +; 
    9.80 +; Also, please note that you can generate CDR records in as many formats as you 
    9.81 +; wish. If you configure 5 different CDR formats, then each event will be logged
    9.82 +; in 5 different places! In the example config files, all formats are commented
    9.83 +; out except for the cdr-csv format.
    9.84 +;
    9.85 +; Here are all the possible back ends:
    9.86 +;
    9.87 +;   csv, custom, manager, odbc, pgsql, radius, sqlite, tds 
    9.88 +;    (also, mysql is available via the asterisk-addons, due to licensing
    9.89 +;     requirements)
    9.90 +;   (please note, also, that other backends can be created, by creating
    9.91 +;    a new backend module in the source cdr/ directory!)
    9.92 +;
    9.93 +; Some of the modules required to provide these backends will not build or install
    9.94 +; unless some dependency requirements are met. Examples of this are pgsql, odbc,
    9.95 +; etc. If you are not getting output as you would expect, the first thing to do
    9.96 +; is to run the command "make menuselect", and check what modules are available,
    9.97 +; by looking in the "2. Call Detail Recording" option in the main menu. If your
    9.98 +; backend is marked with XXX, you know that the "configure" command could not find
    9.99 +; the required libraries for that option.
   9.100 +;
   9.101 +; To get CDRs to be logged to the plain-jane /var/log/asterisk/cdr-csv/Master.csv 
   9.102 +; file, define the [csv] category in this file. No database necessary. The example
   9.103 +; config files are set up to provide this kind of output by default.
   9.104 +;
   9.105 +; To get custom csv CDR records, make sure the cdr_custom.conf file
   9.106 +; is present, and contains the proper [mappings] section. The advantage to
   9.107 +; using this backend, is that you can define which fields to output, and in
   9.108 +; what order. By default, the example configs are set up to mimic the cdr-csv
   9.109 +; output. If you don't make any changes to the mappings, you are basically generating
   9.110 +; the same thing as cdr-csv, but expending more CPU cycles to do so!
   9.111 +;
   9.112 +; To get manager events generated, make sure the cdr_manager.conf file exists,
   9.113 +; and the [general] section is defined, with the single variable 'enabled = yes'.
   9.114 +;
   9.115 +; For odbc, make sure all the proper libs are installed, that "make menuselect"
   9.116 +; shows that the modules are available, and the cdr_odbc.conf file exists, and
   9.117 +; has a [global] section with the proper variables defined.
   9.118 +;
   9.119 +; For pgsql, make sure all the proper libs are installed, that "make menuselect"
   9.120 +; shows that the modules are available, and the cdr_pgsql.conf file exists, and
   9.121 +; has a [global] section with the proper variables defined.
   9.122 +;
   9.123 +; For logging to radius databases, make sure all the proper libs are installed, that 
   9.124 +; "make menuselect" shows that the modules are available, and the [radius]
   9.125 +; category is defined in this file, and in that section, make sure the 'radiuscfg'
   9.126 +; variable is properly pointing to an existing radiusclient.conf file.
   9.127 +;
   9.128 +; For logging to sqlite databases, make sure the 'cdr.db' file exists in the log directory,
   9.129 +; which is usually /var/log/asterisk. Of course, the proper libraries should be available
   9.130 +; during the 'configure' operation.
   9.131 +;
   9.132 +; For tds logging, make sure the proper libraries are available during the 'configure' 
   9.133 +; phase, and that cdr_tds.conf exists and is properly set up with a [global] category.
   9.134 +;
   9.135 +; Also, remember, that if you wish to log CDR info to a database, you will have to define
   9.136 +; a specific table in that databse to make things work! See the doc directory for more details
   9.137 +; on how to create this table in each database.
   9.138 +;
   9.139 +
   9.140 +;[csv]
   9.141 +;usegmtime=yes    ; log date/time in GMT.  Default is "no"
   9.142 +;loguniqueid=yes  ; log uniqueid.  Default is "no
   9.143 +;loguserfield=yes ; log user field.  Default is "no
   9.144 +
   9.145 +;[radius]
   9.146 +;usegmtime=yes    ; log date/time in GMT
   9.147 +;loguniqueid=yes  ; log uniqueid
   9.148 +;loguserfield=yes ; log user field
   9.149 +; Set this to the location of the radiusclient-ng configuration file
   9.150 +; The default is /etc/radiusclient-ng/radiusclient.conf
   9.151 +;radiuscfg => /usr/local/etc/radiusclient-ng/radiusclient.conf

    10.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.2 +++ b/asterisk/cdr_custom.conf	Mon Apr 27 12:19:05 2009 +0200
    10.3 @@ -0,0 +1,10 @@
    10.4 +;
    10.5 +; Mappings for custom config file
    10.6 +;
    10.7 +; to get your csv output in a format tailored to your liking, uncomment the following
    10.8 +; and look for the output in the cdr-custom/Master.csv file (usually in /var/log/asterisk).
    10.9 +; 
   10.10 +;
   10.11 +;[mappings]
   10.12 +;Master.csv => "${CDR(clid)}","${CDR(src)}","${CDR(dst)}","${CDR(dcontext)}","${CDR(channel)}","${CDR(dstchannel)}","${CDR(lastapp)}","${CDR(lastdata)}","${CDR(start)}","${CDR(answer)}","${CDR(end)}","${CDR(duration)}","${CDR(billsec)}","${CDR(disposition)}","${CDR(amaflags)}","${CDR(accountcode)}","${CDR(uniqueid)}","${CDR(userfield)}"
   10.13 +

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/asterisk/codecs.conf	Mon Apr 27 12:19:05 2009 +0200
    11.3 @@ -0,0 +1,65 @@
    11.4 +;[speex]
    11.5 +; CBR encoding quality [0..10]
    11.6 +; used only when vbr = false
    11.7 +;quality => 3
    11.8 +
    11.9 +; codec complexity [0..10]
   11.10 +; tradeoff between cpu/quality
   11.11 +;complexity => 2
   11.12 +
   11.13 +; perceptual enhancement [true / false]
   11.14 +; improves clarity of decoded speech
   11.15 +;enhancement => true
   11.16 +
   11.17 +; voice activity detection [true / false]
   11.18 +; reduces bitrate when no voice detected, used only for CBR
   11.19 +; (implicit in VBR/ABR)
   11.20 +;vad => true
   11.21 +
   11.22 +; variable bit rate [true / false]
   11.23 +; uses bit rate proportionate to voice complexity
   11.24 +;vbr => true
   11.25 +
   11.26 +; available bit rate [bps, 0 = off]
   11.27 +; encoding quality modulated to match this target bit rate
   11.28 +; not recommended with dtx or pp_vad - may cause bandwidth spikes
   11.29 +;abr => 0
   11.30 +
   11.31 +; VBR encoding quality [0-10]
   11.32 +; floating-point values allowed
   11.33 +;vbr_quality => 4
   11.34 +
   11.35 +; discontinuous transmission [true / false]
   11.36 +; stops transmitting completely when silence is detected
   11.37 +; pp_vad is far more effective but more CPU intensive
   11.38 +;dtx => false
   11.39 +
   11.40 +; preprocessor configuration
   11.41 +; these options only affect Speex v1.1.8 or newer
   11.42 +
   11.43 +; enable preprocessor [true / false]
   11.44 +; allows dsp functionality below but incurs CPU overhead
   11.45 +;preprocess => false
   11.46 +
   11.47 +; preproc voice activity detection [true / false]
   11.48 +; more advanced equivalent of DTX, based on voice frequencies
   11.49 +;pp_vad => false
   11.50 +
   11.51 +; preproc automatic gain control [true / false]
   11.52 +;pp_agc => false
   11.53 +;pp_agc_level => 8000
   11.54 +
   11.55 +; preproc denoiser [true / false]
   11.56 +;pp_denoise => false
   11.57 +
   11.58 +; preproc dereverb [true / false]
   11.59 +;pp_dereverb => false
   11.60 +;pp_dereverb_decay => 0.4
   11.61 +;pp_dereverb_level => 0.3
   11.62 +
   11.63 +
   11.64 +;[plc]
   11.65 +; for all codecs which do not support native PLC
   11.66 +; this determines whether to perform generic PLC
   11.67 +; there is a minor performance penalty for this
   11.68 +;genericplc => true

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/asterisk/dundi.conf	Mon Apr 27 12:19:05 2009 +0200
    12.3 @@ -0,0 +1,239 @@
    12.4 +;
    12.5 +; DUNDi configuration file
    12.6 +; 
    12.7 +; For more information about DUNDi, see http://www.dundi.com
    12.8 +;
    12.9 +;
   12.10 +;[general]
   12.11 +;
   12.12 +; The "general" section contains general parameters relating
   12.13 +; to the operation of the dundi client and server.
   12.14 +;
   12.15 +; The first part should be your complete contact information
   12.16 +; should someone else in your peer group need to contact you.
   12.17 +;
   12.18 +;department=Your Department
   12.19 +;organization=Your Company, Inc.
   12.20 +;locality=Your City
   12.21 +;stateprov=ST
   12.22 +;country=US
   12.23 +;email=your@email.com
   12.24 +;phone=+12565551212
   12.25 +;
   12.26 +;
   12.27 +; Specify bind address and port number.  Default is
   12.28 +; 4520
   12.29 +;
   12.30 +;bindaddr=0.0.0.0
   12.31 +;port=4520
   12.32 +;
   12.33 +; Our entity identifier (Should generally be the MAC address of the
   12.34 +; machine it's running on.  Defaults to the first eth address, but you
   12.35 +; can override it here, as long as you set it to the MAC of *something*
   12.36 +; you own!)
   12.37 +;
   12.38 +;entityid=00:07:E9:3B:76:60
   12.39 +;
   12.40 +; Peers shall cache our query responses for the specified time,
   12.41 +; given in seconds. Default is 3600.
   12.42 +;
   12.43 +;cachetime=3600
   12.44 +;
   12.45 +; This defines the max depth in which to search the DUNDi system.
   12.46 +; Note that the maximum time that we will wait for a response is
   12.47 +; (2000 + 200 * ttl) ms.
   12.48 +;
   12.49 +;ttl=32
   12.50 +;
   12.51 +; If we don't get ACK to our DPDISCOVER within 2000ms, and autokill is set
   12.52 +; to yes, then we cancel the whole thing (that's enough time for one 
   12.53 +; retransmission only).  This is used to keep things from stalling for a long
   12.54 +; time for a host that is not available, but would be ill advised for bad 
   12.55 +; connections.  In addition to 'yes' or 'no' you can also specify a number
   12.56 +; of milliseconds.  See 'qualify' for individual peers to turn on for just
   12.57 +; a specific peer.
   12.58 +;
   12.59 +;autokill=yes
   12.60 +;
   12.61 +; pbx_dundi creates a rotating key called "secret", under the family
   12.62 +; 'secretpath'.  The default family is dundi (resulting in 
   12.63 +; the key being held at dundi/secret).
   12.64 +;
   12.65 +;secretpath=dundi
   12.66 +;
   12.67 +; The 'storehistory' option (also changeable at runtime with
   12.68 +; 'dundi store history' and 'dundi no store history') will
   12.69 +; cause the DUNDi engine to keep track of the last several
   12.70 +; queries and the amount of time each query took to execute
   12.71 +; for the purpose of tracking slow nodes.  This option is
   12.72 +; off by default due to performance impacts.
   12.73 +;
   12.74 +;storehistory=yes
   12.75 +
   12.76 +;[mappings]
   12.77 +;
   12.78 +; The "mappings" section maps DUNDi contexts
   12.79 +; to contexts on the local asterisk system.  Remember
   12.80 +; that numbers that are made available under the e164 
   12.81 +; DUNDi context are regulated by the DUNDi General Peering 
   12.82 +; Agreement (GPA) if you are a member of the DUNDi E.164
   12.83 +; Peering System.
   12.84 +;
   12.85 +; dundi_context => local_context,weight,tech,dest[,options]]
   12.86 +;
   12.87 +; 'dundi_context' is the name of the context being requested
   12.88 +; within the DUNDi request
   12.89 +;
   12.90 +; 'local_context' is the name of the context on the local system
   12.91 +; in which numbers can be looked up for which responses shall be given.
   12.92 +;
   12.93 +; 'weight' is the weight to use for the responses provided from this
   12.94 +; mapping.  The number must be >= 0 and < 60000.  Since it is totally
   12.95 +; valid to receive multiple responses to a query, responses received
   12.96 +; with a lower weight are tried first.  Note that the weight has a
   12.97 +; special meaning in the e164 context - see the GPA for more details.
   12.98 +;
   12.99 +; 'tech' is the technology to use (IAX, SIP, H323)
  12.100 +;
  12.101 +; 'dest' is the destination to supply for reaching that number.  The
  12.102 +; following variables can be used in the destination string and will
  12.103 +; be automatically substituted:
  12.104 +; ${NUMBER}: The number being requested
  12.105 +; ${IPADDR}: The IP address to connect to
  12.106 +; ${SECRET}: The current rotating secret key to be used
  12.107 +;
  12.108 +; Further options may include:
  12.109 +;
  12.110 +; nounsolicited:  No unsolicited calls of any type permitted via this 
  12.111 +;                 route
  12.112 +; nocomunsolicit: No commercial unsolicited calls permitted via 
  12.113 +;                 this route
  12.114 +; residential:    This number is known to be a residence
  12.115 +; commercial:     This number is known to be a business
  12.116 +; mobile:         This number is known to be a mobile phone
  12.117 +; nocomunsolicit: No commercial unsolicited calls permitted via 
  12.118 +;                 this route
  12.119 +; nopartial:      Do not search for partial matches
  12.120 +;
  12.121 +; There *must* exist an entry in mappings for DUNDi to respond
  12.122 +; to any request, although it may be empty.
  12.123 +;
  12.124 +;e164 => dundi-e164-canonical,0,IAX2,dundi:${SECRET}@${IPADDR}/${NUMBER},nounsolicited,nocomunsolicit,nopartial
  12.125 +;e164 => dundi-e164-customers,100,IAX2,dundi:${SECRET}@${IPADDR}/${NUMBER},nounsolicited,nocomunsolicit,nopartial
  12.126 +;e164 => dundi-e164-via-pstn,400,IAX2,dundi:${SECRET}@${IPADDR}/${NUMBER},nounsolicited,nocomunsolicit,nopartial
  12.127 +
  12.128 +;digexten => default,0,IAX2,guest@lappy/${NUMBER}
  12.129 +;asdf =>
  12.130 +
  12.131 +
  12.132 +;
  12.133 +;
  12.134 +; The remaining sections represent the peers
  12.135 +; that we fundamentally trust.  The section name
  12.136 +; represents the name and optionally at a specific
  12.137 +; DUNDi context if you want the trust to be established
  12.138 +; for only a specific DUNDi context.
  12.139 +;
  12.140 +; inkey - What key they will be authenticating to us with
  12.141 +;
  12.142 +; outkey - What key we use to authenticate to them
  12.143 +;
  12.144 +; host - What their host is
  12.145 +;
  12.146 +; order - What search order to use.  May be 'primary', 'secondary', 
  12.147 +;         'tertiary' or 'quartiary'.  In large systems, it is beneficial
  12.148 +;         to only query one up-stream host in order to maximize caching
  12.149 +;         value.  Adding one with primary and one with secondary gives you
  12.150 +;         redundancy without sacrificing performance.
  12.151 +;
  12.152 +; include - Includes this peer when searching a particular context
  12.153 +;           for lookup (set "all" to perform all lookups with that
  12.154 +;           host.  This is also the context in which peers are permitted
  12.155 +;           to precache.
  12.156 +;
  12.157 +; noinclude - Disincludes this peer when searching a particular context
  12.158 +;             for lookup (set "all" to perform no lookups with that
  12.159 +;             host.
  12.160 +;
  12.161 +; permit - Permits this peer to search a given DUNDi context on
  12.162 +;          the local system.  Set "all" to permit this host to
  12.163 +;          lookup all contexts.  This is also a context for which
  12.164 +;          we will create/forward PRECACHE commands.
  12.165 +;
  12.166 +; deny -   Denies this peer to search a given DUNDi context on
  12.167 +;          the local system.  Set "all" to deny this host to
  12.168 +;          lookup all contexts.
  12.169 +;
  12.170 +; model - inbound, outbound, or symmetric for whether we receive 
  12.171 +;         requests only, transmit requests only, or do both.
  12.172 +;
  12.173 +; precache - Utilize/Permit precaching with this peer (to pre
  12.174 +;            cache means to provide an answer when no request
  12.175 +;            was made and is used so that machines with few
  12.176 +;            routes can push those routes up a to a higher level).
  12.177 +;            outgoing means we send precache routes to this peer,
  12.178 +;            incoming means we permit this peer to send us
  12.179 +;            precache routes.  symmetric means we do both.
  12.180 +;
  12.181 +; Note: You cannot mix symmetric/outbound model with symmetric/inbound
  12.182 +; precache, nor can you mix symmetric/inbound model with symmetric/outbound
  12.183 +; precache.
  12.184 +;
  12.185 +;
  12.186 +; The '*' peer is special and matches an unspecified entity
  12.187 +;
  12.188 +
  12.189 +;
  12.190 +; Sample Primary e164 DUNDi peer
  12.191 +;
  12.192 +;[00:50:8B:F3:75:BB]
  12.193 +;model = symmetric
  12.194 +;host = 64.215.96.114
  12.195 +;inkey = digium
  12.196 +;outkey = misery
  12.197 +;include = e164
  12.198 +;permit = e164
  12.199 +;qualify = yes
  12.200 +
  12.201 +;
  12.202 +; Sample Secondary e164 DUNDi peer
  12.203 +;
  12.204 +;[00:A0:C9:96:92:84]
  12.205 +;model = symmetric
  12.206 +;host = misery.digium.com
  12.207 +;inkey = misery
  12.208 +;outkey = ourkey
  12.209 +;include = e164
  12.210 +;permit = e164
  12.211 +;qualify = yes
  12.212 +;order = secondary
  12.213 +
  12.214 +;
  12.215 +; Sample "push mode" downstream host
  12.216 +;
  12.217 +;[00:0C:76:96:75:28]
  12.218 +;model = inbound
  12.219 +;host = dynamic
  12.220 +;precache = inbound
  12.221 +;inkey = littleguy
  12.222 +;outkey = ourkey
  12.223 +;include = e164	; In this case used only for precaching
  12.224 +;permit = e164      
  12.225 +;qualify = yes
  12.226 +
  12.227 +;
  12.228 +; Sample "push mode" upstream host
  12.229 +;
  12.230 +;[00:07:E9:3B:76:60]
  12.231 +;model = outbound
  12.232 +;precache = outbound
  12.233 +;host = 216.207.245.34
  12.234 +;register = yes
  12.235 +;inkey = dhcp34
  12.236 +;permit = all ; In this case used only for precaching
  12.237 +;include = all 
  12.238 +;qualify = yes
  12.239 +;outkey=foo
  12.240 +
  12.241 +;[*]
  12.242 +;

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/asterisk/enum.conf	Mon Apr 27 12:19:05 2009 +0200
    13.3 @@ -0,0 +1,22 @@
    13.4 +;
    13.5 +; ENUM Configuration for resolving phone numbers over DNS
    13.6 +;
    13.7 +; Sample config for Asterisk
    13.8 +; This file is reloaded at "module reload enum" in the CLI
    13.9 +;
   13.10 +;[general]
   13.11 +;
   13.12 +; The search list for domains may be customized.  Domains are searched
   13.13 +; in the order they are listed here.
   13.14 +;
   13.15 +;search => e164.arpa
   13.16 +;
   13.17 +; If you'd like to use the E.164.org public ENUM registry in addition
   13.18 +; to the official e164.arpa one, uncomment the following line
   13.19 +;
   13.20 +;search => e164.org
   13.21 +;
   13.22 +; As there are more H323 drivers available you have to select to which
   13.23 +; drive a H323 URI will map. Default is "H323".
   13.24 +;
   13.25 +;h323driver => H323

    14.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    14.2 +++ b/asterisk/extensions.conf	Mon Apr 27 12:19:05 2009 +0200
    14.3 @@ -0,0 +1,614 @@
    14.4 +; extensions.conf - the Asterisk dial plan
    14.5 +;
    14.6 +; Static extension configuration file, used by
    14.7 +; the pbx_config module. This is where you configure all your 
    14.8 +; inbound and outbound calls in Asterisk. 
    14.9 +; 
   14.10 +; This configuration file is reloaded 
   14.11 +; - With the "dialplan reload" command in the CLI
   14.12 +; - With the "reload" command (that reloads everything) in the CLI
   14.13 +
   14.14 +;
   14.15 +; The "General" category is for certain variables.  
   14.16 +;
   14.17 +;[general]
   14.18 +;
   14.19 +; If static is set to no, or omitted, then the pbx_config will rewrite
   14.20 +; this file when extensions are modified.  Remember that all comments
   14.21 +; made in the file will be lost when that happens. 
   14.22 +;
   14.23 +; XXX Not yet implemented XXX
   14.24 +;
   14.25 +;static=yes
   14.26 +;
   14.27 +; if static=yes and writeprotect=no, you can save dialplan by
   14.28 +; CLI command "dialplan save" too
   14.29 +;
   14.30 +;writeprotect=no
   14.31 +;
   14.32 +; If autofallthrough is set, then if an extension runs out of
   14.33 +; things to do, it will terminate the call with BUSY, CONGESTION
   14.34 +; or HANGUP depending on Asterisk's best guess. This is the default.
   14.35 +;
   14.36 +; If autofallthrough is not set, then if an extension runs out of 
   14.37 +; things to do, Asterisk will wait for a new extension to be dialed 
   14.38 +; (this is the original behavior of Asterisk 1.0 and earlier).
   14.39 +;
   14.40 +;autofallthrough=no
   14.41 +;
   14.42 +; If clearglobalvars is set, global variables will be cleared 
   14.43 +; and reparsed on an extensions reload, or Asterisk reload.
   14.44 +;
   14.45 +; If clearglobalvars is not set, then global variables will persist
   14.46 +; through reloads, and even if deleted from the extensions.conf or
   14.47 +; one of its included files, will remain set to the previous value.
   14.48 +;
   14.49 +; NOTE: A complication sets in, if you put your global variables into
   14.50 +; the AEL file, instead of the extensions.conf file. With clearglobalvars
   14.51 +; set, a "reload" will often leave the globals vars cleared, because it
   14.52 +; is not unusual to have extensions.conf (which will have no globals)
   14.53 +; load after the extensions.ael file (where the global vars are stored).
   14.54 +; So, with "reload" in this particular situation, first the AEL file will
   14.55 +; clear and then set all the global vars, then, later, when the extensions.conf
   14.56 +; file is loaded, the global vars are all cleared, and then not set, because
   14.57 +; they are not stored in the extensions.conf file.
   14.58 +;
   14.59 +;clearglobalvars=no
   14.60 +;
   14.61 +; If priorityjumping is set to 'yes', then applications that support
   14.62 +; 'jumping' to a different priority based on the result of their operations
   14.63 +; will do so (this is backwards compatible behavior with pre-1.2 releases
   14.64 +; of Asterisk). Individual applications can also be requested to do this
   14.65 +; by passing a 'j' option in their arguments.
   14.66 +;
   14.67 +;priorityjumping=yes
   14.68 +;
   14.69 +; User context is where entries from users.conf are registered.  The
   14.70 +; default value is 'default'
   14.71 +;
   14.72 +;userscontext=default
   14.73 +;
   14.74 +; You can include other config files, use the #include command
   14.75 +; (without the ';'). Note that this is different from the "include" command
   14.76 +; that includes contexts within other contexts. The #include command works
   14.77 +; in all asterisk configuration files.
   14.78 +;#include "filename.conf"
   14.79 +
   14.80 +; The "Globals" category contains global variables that can be referenced
   14.81 +; in the dialplan with the GLOBAL dialplan function:
   14.82 +; ${GLOBAL(VARIABLE)}
   14.83 +; ${${GLOBAL(VARIABLE)}} or ${text${GLOBAL(VARIABLE)}} or any hybrid
   14.84 +; Unix/Linux environmental variables can be reached with the ENV dialplan
   14.85 +; function: ${ENV(VARIABLE)}
   14.86 +;
   14.87 +;[globals]
   14.88 +;CONSOLE=Console/dsp				; Console interface for demo
   14.89 +;CONSOLE=Zap/1
   14.90 +;CONSOLE=Phone/phone0
   14.91 +;IAXINFO=guest					; IAXtel username/password
   14.92 +;IAXINFO=myuser:mypass
   14.93 +;TRUNK=Zap/G2					; Trunk interface
   14.94 +;
   14.95 +; Note the 'G2' in the TRUNK variable above. It specifies which group (defined
   14.96 +; in zapata.conf) to dial, i.e. group 2, and how to choose a channel to use in
   14.97 +; the specified group. The four possible options are:
   14.98 +;
   14.99 +; g: select the lowest-numbered non-busy Zap channel
  14.100 +;    (aka. ascending sequential hunt group).
  14.101 +; G: select the highest-numbered non-busy Zap channel
  14.102 +;    (aka. descending sequential hunt group).
  14.103 +; r: use a round-robin search, starting at the next highest channel than last
  14.104 +;    time (aka. ascending rotary hunt group).
  14.105 +; R: use a round-robin search, starting at the next lowest channel than last
  14.106 +;    time (aka. descending rotary hunt group).
  14.107 +;
  14.108 +;TRUNKMSD=1					; MSD digits to strip (usually 1 or 0)
  14.109 +;TRUNK=IAX2/user:pass@provider
  14.110 +
  14.111 +;
  14.112 +; Any category other than "General" and "Globals" represent 
  14.113 +; extension contexts, which are collections of extensions.  
  14.114 +;
  14.115 +; Extension names may be numbers, letters, or combinations
  14.116 +; thereof. If an extension name is prefixed by a '_'
  14.117 +; character, it is interpreted as a pattern rather than a
  14.118 +; literal.  In patterns, some characters have special meanings:
  14.119 +;
  14.120 +;   X - any digit from 0-9
  14.121 +;   Z - any digit from 1-9
  14.122 +;   N - any digit from 2-9
  14.123 +;   [1235-9] - any digit in the brackets (in this example, 1,2,3,5,6,7,8,9)
  14.124 +;   . - wildcard, matches anything remaining (e.g. _9011. matches 
  14.125 +;	anything starting with 9011 excluding 9011 itself)
  14.126 +;   ! - wildcard, causes the matching process to complete as soon as
  14.127 +;       it can unambiguously determine that no other matches are possible
  14.128 +;
  14.129 +; For example the extension _NXXXXXX would match normal 7 digit dialings, 
  14.130 +; while _1NXXNXXXXXX would represent an area code plus phone number
  14.131 +; preceded by a one.
  14.132 +;
  14.133 +; Each step of an extension is ordered by priority, which must
  14.134 +; always start with 1 to be considered a valid extension.  The priority
  14.135 +; "next" or "n" means the previous priority plus one, regardless of whether
  14.136 +; the previous priority was associated with the current extension or not.
  14.137 +; The priority "same" or "s" means the same as the previously specified
  14.138 +; priority, again regardless of whether the previous entry was for the
  14.139 +; same extension.  Priorities may be immediately followed by a plus sign
  14.140 +; and another integer to add that amount (most useful with 's' or 'n').  
  14.141 +; Priorities may then also have an alias, or label, in 
  14.142 +; parenthesis after their name which can be used in goto situations
  14.143 +;
  14.144 +; Contexts contain several lines, one for each step of each
  14.145 +; extension, which can take one of two forms as listed below,
  14.146 +; with the first form being preferred. 
  14.147 +;
  14.148 +;[context]
  14.149 +;exten => someexten,{priority|label{+|-}offset}[(alias)],application(arg1,arg2,...)
  14.150 +;exten => someexten,{priority|label{+|-}offset}[(alias)],application,arg1|arg2...
  14.151 +;
  14.152 +; Included Contexts
  14.153 +;
  14.154 +; One may include another context in the current one as well, optionally with a
  14.155 +; date and time.  Included contexts are included in the order
  14.156 +; they are listed.
  14.157 +; The reason a context would include other contexts is for their 
  14.158 +; extensions.
  14.159 +; The algorithm to find an extension is recursive, and works in this
  14.160 +; fashion: 
  14.161 +;	 first, given a stack on which to store context references, 
  14.162 +;           push the context to find the extension onto the stack...
  14.163 +;    a) Try to find a matching extension in the context at the top of 
  14.164 +;       the stack, and, if found, begin executing the priorities
  14.165 +;       there in sequence.
  14.166 +;    b) If not found, Search the switches, if any declared, in
  14.167 +;       sequence.
  14.168 +;    c) If still not found, for each include, push that context onto 
  14.169 +;       the top of the context stack, and recurse to a).
  14.170 +;    d) If still not found, pop the entry from the top of the stack; 
  14.171 +;       if the stack is empty, the search has failed. If it's not, 
  14.172 +;       continue with the next context in c).
  14.173 +; This is a depth-first traversal, and stops with the first context 
  14.174 +; that provides a matching extension. As usual, if more than one
  14.175 +; pattern in a context will match, the 'best' match will win.
  14.176 +; Please note that that extensions found in an included context are
  14.177 +; treated as if they were in the context from which the search began.
  14.178 +; The PBX's notion of the "current context" is not changed.
  14.179 +; Please note that in a context, it does not matter where an include
  14.180 +; directive occurs. Whether at the top, or near the bottom, the effect 
  14.181 +; will be the same. The only thing that matters is that if there is 
  14.182 +; more than one include directive, they will be searched for extensions 
  14.183 +; in order, first to last.
  14.184 +; Also please note that pattern matches (like _9XX) are not treated
  14.185 +; any differently than exact matches (like 987). Also note that the
  14.186 +; order of extensions in a context have no affect on the outcome.
  14.187 +;
  14.188 +; Timing list for includes is 
  14.189 +;
  14.190 +;   <time range>|<days of week>|<days of month>|<months>
  14.191 +;
  14.192 +; Note that ranges may be specified to wrap around the ends.  Also, minutes are
  14.193 +; fine-grained only down to the closest even minute.
  14.194 +;
  14.195 +;include => daytime|9:00-17:00|mon-fri|*|*
  14.196 +;include => weekend|*|sat-sun|*|*
  14.197 +;include => weeknights|17:02-8:58|mon-fri|*|*
  14.198 +;
  14.199 +; ignorepat can be used to instruct drivers to not cancel dialtone upon
  14.200 +; receipt of a particular pattern.  The most commonly used example is
  14.201 +; of course '9' like this:
  14.202 +;
  14.203 +;ignorepat => 9
  14.204 +;
  14.205 +; so that dialtone remains even after dialing a 9.
  14.206 +;
  14.207 +
  14.208 +;
  14.209 +; Sample entries for extensions.conf
  14.210 +;
  14.211 +;
  14.212 +;[dundi-e164-canonical]
  14.213 +;
  14.214 +; List canonical entries here
  14.215 +;
  14.216 +;exten => 12564286000,1,Macro(stdexten,6000,IAX2/foo)
  14.217 +;exten => _125642860XX,1,Dial(IAX2/otherbox/${EXTEN:7})
  14.218 +
  14.219 +;[dundi-e164-customers]
  14.220 +;
  14.221 +; If you are an ITSP or Reseller, list your customers here.
  14.222 +;
  14.223 +;exten => _12564286000,1,Dial(SIP/customer1)
  14.224 +;exten => _12564286001,1,Dial(IAX2/customer2)
  14.225 +
  14.226 +;[dundi-e164-via-pstn]
  14.227 +;
  14.228 +; If you are freely delivering calls to the PSTN, list them here
  14.229 +;
  14.230 +;exten => _1256428XXXX,1,Dial(Zap/G2/${EXTEN:7}) ; Expose all of 256-428 
  14.231 +;exten => _1256325XXXX,1,Dial(Zap/G2/${EXTEN:7}) ; Ditto for 256-325
  14.232 +
  14.233 +;[dundi-e164-local]
  14.234 +;
  14.235 +; Context to put your dundi IAX2 or SIP user in for
  14.236 +; full access
  14.237 +;
  14.238 +;include => dundi-e164-canonical
  14.239 +;include => dundi-e164-customers
  14.240 +;include => dundi-e164-via-pstn
  14.241 +
  14.242 +;[dundi-e164-switch]
  14.243 +;
  14.244 +; Just a wrapper for the switch
  14.245 +;
  14.246 +;switch => DUNDi/e164
  14.247 +
  14.248 +;[dundi-e164-lookup]
  14.249 +;
  14.250 +; Locally to lookup, try looking for a local E.164 solution
  14.251 +; then try DUNDi if we don't have one.
  14.252 +;
  14.253 +;include => dundi-e164-local
  14.254 +;include => dundi-e164-switch
  14.255 +;
  14.256 +; DUNDi can also be implemented as a Macro instead of using 
  14.257 +; the Local channel driver. 
  14.258 +;
  14.259 +;[macro-dundi-e164]
  14.260 +;
  14.261 +; ARG1 is the extension to Dial
  14.262 +;
  14.263 +; Extension "s" is not a wildcard extension that matches "anything".
  14.264 +; In macros, it is the start extension. In most other cases, 
  14.265 +; you have to goto "s" to execute that extension.
  14.266 +;
  14.267 +; For wildcard matches, see above - all pattern matches start with
  14.268 +; an underscore.
  14.269 +;exten => s,1,Goto(${ARG1},1)
  14.270 +;include => dundi-e164-lookup
  14.271 +
  14.272 +;
  14.273 +; Here are the entries you need to participate in the IAXTEL
  14.274 +; call routing system.  Most IAXTEL numbers begin with 1-700, but
  14.275 +; there are exceptions.  For more information, and to sign
  14.276 +; up, please go to www.gnophone.com or www.iaxtel.com
  14.277 +;
  14.278 +;[iaxtel700]
  14.279 +;exten => _91700XXXXXXX,1,Dial(IAX2/${GLOBAL(IAXINFO)}@iaxtel.com/${EXTEN:1}@iaxtel)
  14.280 +
  14.281 +;
  14.282 +; The SWITCH statement permits a server to share the dialplan with
  14.283 +; another server. Use with care: Reciprocal switch statements are not
  14.284 +; allowed (e.g. both A -> B and B -> A), and the switched server needs
  14.285 +; to be on-line or else dialing can be severly delayed.
  14.286 +;
  14.287 +;[iaxprovider]
  14.288 +;switch => IAX2/user:[key]@myserver/mycontext
  14.289 +
  14.290 +;[trunkint]
  14.291 +;
  14.292 +; International long distance through trunk
  14.293 +;
  14.294 +;exten => _9011.,1,Macro(dundi-e164,${EXTEN:4})
  14.295 +;exten => _9011.,n,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.296 +
  14.297 +;[trunkld]
  14.298 +;
  14.299 +; Long distance context accessed through trunk
  14.300 +;
  14.301 +;exten => _91NXXNXXXXXX,1,Macro(dundi-e164,${EXTEN:1})
  14.302 +;exten => _91NXXNXXXXXX,n,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.303 +
  14.304 +;[trunklocal]
  14.305 +;
  14.306 +; Local seven-digit dialing accessed through trunk interface
  14.307 +;
  14.308 +;exten => _9NXXXXXX,1,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.309 +
  14.310 +;[trunktollfree]
  14.311 +;
  14.312 +; Long distance context accessed through trunk interface
  14.313 +;
  14.314 +;exten => _91800NXXXXXX,1,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.315 +;exten => _91888NXXXXXX,1,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.316 +;exten => _91877NXXXXXX,1,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.317 +;exten => _91866NXXXXXX,1,Dial(${GLOBAL(TRUNK)}/${EXTEN:${GLOBAL(TRUNKMSD)}})
  14.318 +
  14.319 +;[international]
  14.320 +;
  14.321 +; Master context for international long distance
  14.322 +;
  14.323 +;ignorepat => 9
  14.324 +;include => longdistance
  14.325 +;include => trunkint
  14.326 +
  14.327 +;[longdistance]
  14.328 +;
  14.329 +; Master context for long distance
  14.330 +;
  14.331 +;ignorepat => 9
  14.332 +;include => local
  14.333 +;include => trunkld
  14.334 +
  14.335 +;[local]
  14.336 +;
  14.337 +; Master context for local, toll-free, and iaxtel calls only
  14.338 +;
  14.339 +;ignorepat => 9
  14.340 +;include => default
  14.341 +;include => trunklocal
  14.342 +;include => iaxtel700
  14.343 +;include => trunktollfree
  14.344 +;include => iaxprovider
  14.345 +
  14.346 +;Include parkedcalls (or the context you define in features conf)
  14.347 +;to enable call parking.
  14.348 +;include => parkedcalls
  14.349 +;
  14.350 +; You can use an alternative switch type as well, to resolve
  14.351 +; extensions that are not known here, for example with remote 
  14.352 +; IAX switching you transparently get access to the remote
  14.353 +; Asterisk PBX
  14.354 +; 
  14.355 +; switch => IAX2/user:password@bigserver/local
  14.356 +;
  14.357 +; An "lswitch" is like a switch but is literal, in that
  14.358 +; variable substitution is not performed at load time
  14.359 +; but is passed to the switch directly (presumably to
  14.360 +; be substituted in the switch routine itself)
  14.361 +;
  14.362 +; lswitch => Loopback/12${EXTEN}@othercontext
  14.363 +;
  14.364 +; An "eswitch" is like a switch but the evaluation of
  14.365 +; variable substitution is performed at runtime before
  14.366 +; being passed to the switch routine.
  14.367 +;
  14.368 +; eswitch => IAX2/context@${CURSERVER}
  14.369 +
  14.370 +;[macro-trunkdial]
  14.371 +;
  14.372 +; Standard trunk dial macro (hangs up on a dialstatus that should 
  14.373 +; terminate call)
  14.374 +;   ${ARG1} - What to dial
  14.375 +;
  14.376 +;exten => s,1,Dial(${ARG1})
  14.377 +;exten => s,n,Goto(s-${DIALSTATUS},1)
  14.378 +;exten => s-NOANSWER,1,Hangup
  14.379 +;exten => s-BUSY,1,Hangup
  14.380 +;exten => _s-.,1,NoOp
  14.381 +
  14.382 +;[macro-stdexten];
  14.383 +;
  14.384 +; Standard extension macro:
  14.385 +;   ${ARG1} - Extension  (we could have used ${MACRO_EXTEN} here as well
  14.386 +;   ${ARG2} - Device(s) to ring
  14.387 +;
  14.388 +;exten => s,1,Dial(${ARG2},20)			; Ring the interface, 20 seconds maximum
  14.389 +;exten => s,2,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
  14.390 +
  14.391 +;exten => s-NOANSWER,1,Voicemail(${ARG1},u)	; If unavailable, send to voicemail w/ unavail announce
  14.392 +;exten => s-NOANSWER,2,Goto(default,s,1)		; If they press #, return to start
  14.393 +
  14.394 +;exten => s-BUSY,1,Voicemail(${ARG1},b)		; If busy, send to voicemail w/ busy announce
  14.395 +;exten => s-BUSY,2,Goto(default,s,1)		; If they press #, return to start
  14.396 +
  14.397 +;exten => _s-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
  14.398 +
  14.399 +;exten => a,1,VoicemailMain(${ARG1})		; If they press *, send the user into VoicemailMain
  14.400 +
  14.401 +;[macro-stdPrivacyexten];
  14.402 +;
  14.403 +; Standard extension macro:
  14.404 +;   ${ARG1} - Extension  (we could have used ${MACRO_EXTEN} here as well
  14.405 +;   ${ARG2} - Device(s) to ring
  14.406 +;   ${ARG3} - Optional DONTCALL context name to jump to (assumes the s,1 extension-priority)
  14.407 +;   ${ARG4} - Optional TORTURE context name to jump to (assumes the s,1 extension-priority)`
  14.408 +;
  14.409 +;exten => s,1,Dial(${ARG2},20|p)			; Ring the interface, 20 seconds maximum, call screening 
  14.410 +						; option (or use P for databased call screening)
  14.411 +;exten => s,2,Goto(s-${DIALSTATUS},1)		; Jump based on status (NOANSWER,BUSY,CHANUNAVAIL,CONGESTION,ANSWER)
  14.412 +
  14.413 +;exten => s-NOANSWER,1,Voicemail(${ARG1},u)	; If unavailable, send to voicemail w/ unavail announce
  14.414 +;exten => s-NOANSWER,2,Goto(default,s,1)		; If they press #, return to start
  14.415 +
  14.416 +;exten => s-BUSY,1,Voicemail(${ARG1},b)		; If busy, send to voicemail w/ busy announce
  14.417 +;exten => s-BUSY,2,Goto(default,s,1)		; If they press #, return to start
  14.418 +
  14.419 +;exten => s-DONTCALL,1,Goto(${ARG3},s,1)		; Callee chose to send this call to a polite "Don't call again" script.
  14.420 +
  14.421 +;exten => s-TORTURE,1,Goto(${ARG4},s,1)		; Callee chose to send this call to a telemarketer torture script.
  14.422 +
  14.423 +;exten => _s-.,1,Goto(s-NOANSWER,1)		; Treat anything else as no answer
  14.424 +
  14.425 +;exten => a,1,VoicemailMain(${ARG1})		; If they press *, send the user into VoicemailMain
  14.426 +
  14.427 +;[macro-page];
  14.428 +;
  14.429 +; Paging macro:
  14.430 +;
  14.431 +;       Check to see if SIP device is in use and DO NOT PAGE if they are
  14.432 +;
  14.433 +;   ${ARG1} - Device to page
  14.434 +
  14.435 +;exten => s,1,ChanIsAvail(${ARG1}|js)			; j is for Jump and s is for ANY call
  14.436 +;exten => s,n,GoToIf([${AVAILSTATUS} = "1"]?autoanswer:fail)
  14.437 +;exten => s,n(autoanswer),Set(_ALERT_INFO="RA")			; This is for the PolyComs
  14.438 +;exten => s,n,SIPAddHeader(Call-Info: Answer-After=0)	; This is for the Grandstream, Snoms, and Others
  14.439 +;exten => s,n,NoOp()					; Add others here and Post on the Wiki!!!!
  14.440 +;exten => s,n,Dial(${ARG1}||)
  14.441 +;exten => s,n(fail),Hangup
  14.442 +
  14.443 +
  14.444 +;[demo]
  14.445 +;
  14.446 +; We start with what to do when a call first comes in.
  14.447 +;
  14.448 +;exten => s,1,Wait(1)			; Wait a second, just for fun
  14.449 +;exten => s,n,Answer			; Answer the line
  14.450 +;exten => s,n,Set(TIMEOUT(digit)=5)	; Set Digit Timeout to 5 seconds
  14.451 +;exten => s,n,Set(TIMEOUT(response)=10)	; Set Response Timeout to 10 seconds
  14.452 +;exten => s,n(restart),BackGround(demo-congrats)	; Play a congratulatory message
  14.453 +;exten => s,n(instruct),BackGround(demo-instruct)	; Play some instructions
  14.454 +;exten => s,n,WaitExten			; Wait for an extension to be dialed.
  14.455 +
  14.456 +;exten => 2,1,BackGround(demo-moreinfo)	; Give some more information.
  14.457 +;exten => 2,n,Goto(s,instruct)
  14.458 +
  14.459 +;exten => 3,1,Set(LANGUAGE()=fr)		; Set language to french
  14.460 +;exten => 3,n,Goto(s,restart)		; Start with the congratulations
  14.461 +
  14.462 +;exten => 1000,1,Goto(default,s,1)
  14.463 +;
  14.464 +; We also create an example user, 1234, who is on the console and has
  14.465 +; voicemail, etc.
  14.466 +;
  14.467 +;exten => 1234,1,Playback(transfer,skip)		; "Please hold while..." 
  14.468 +					; (but skip if channel is not up)
  14.469 +;exten => 1234,n,Macro(stdexten,1234,${GLOBAL(CONSOLE)})
  14.470 +
  14.471 +;exten => 1235,1,Voicemail(1234,u)		; Right to voicemail
  14.472 +
  14.473 +;exten => 1236,1,Dial(Console/dsp)		; Ring forever
  14.474 +;exten => 1236,n,Voicemail(1234,b)		; Unless busy
  14.475 +
  14.476 +;
  14.477 +; # for when they're done with the demo
  14.478 +;
  14.479 +;exten => #,1,Playback(demo-thanks)	; "Thanks for trying the demo"
  14.480 +;exten => #,n,Hangup			; Hang them up.
  14.481 +
  14.482 +;
  14.483 +; A timeout and "invalid extension rule"
  14.484 +;
  14.485 +;exten => t,1,Goto(#,1)			; If they take too long, give up
  14.486 +;exten => i,1,Playback(invalid)		; "That's not valid, try again"
  14.487 +
  14.488 +;
  14.489 +; Create an extension, 500, for dialing the
  14.490 +; Asterisk demo.
  14.491 +;
  14.492 +;exten => 500,1,Playback(demo-abouttotry); Let them know what's going on
  14.493 +;exten => 500,n,Dial(IAX2/guest@pbx.digium.com/s@default)	; Call the Asterisk demo
  14.494 +;exten => 500,n,Playback(demo-nogo)	; Couldn't connect to the demo site
  14.495 +;exten => 500,n,Goto(s,6)		; Return to the start over message.
  14.496 +
  14.497 +;
  14.498 +; Create an extension, 600, for evaluating echo latency.
  14.499 +;
  14.500 +;exten => 600,1,Playback(demo-echotest)	; Let them know what's going on
  14.501 +;exten => 600,n,Echo			; Do the echo test
  14.502 +;exten => 600,n,Playback(demo-echodone)	; Let them know it's over
  14.503 +;exten => 600,n,Goto(s,6)		; Start over
  14.504 +
  14.505 +;
  14.506 +;	You can use the Macro Page to intercom a individual user
  14.507 +;exten => 76245,1,Macro(page,SIP/Grandstream1)
  14.508 +; or if your peernames are the same as extensions
  14.509 +;exten => _7XXX,1,Macro(page,SIP/${EXTEN})
  14.510 +;
  14.511 +;
  14.512 +; System Wide Page at extension 7999
  14.513 +;
  14.514 +;exten => 7999,1,Set(TIMEOUT(absolute)=60)
  14.515 +;exten => 7999,2,Page(Local/Grandstream1@page&Local/Xlite1@page&Local/1234@page/n|d)
  14.516 +
  14.517 +; Give voicemail at extension 8500
  14.518 +;
  14.519 +;exten => 8500,1,VoicemailMain
  14.520 +;exten => 8500,n,Goto(s,6)
  14.521 +;
  14.522 +; Here's what a phone entry would look like (IXJ for example)
  14.523 +;
  14.524 +;exten => 1265,1,Dial(Phone/phone0,15)
  14.525 +;exten => 1265,n,Goto(s,5)
  14.526 +
  14.527 +;
  14.528 +;	The page context calls up the page macro that sets variables needed for auto-answer
  14.529 +;	It is in is own context to make calling it from the Page() application as simple as 
  14.530 +;	Local/{peername}@page
  14.531 +;
  14.532 +;[page]
  14.533 +;exten => _X.,1,Macro(page,SIP/${EXTEN})
  14.534 +
  14.535 +;[mainmenu]
  14.536 +;
  14.537 +; Example "main menu" context with submenu
  14.538 +;
  14.539 +;exten => s,1,Answer
  14.540 +;exten => s,n,Background(thanks)		; "Thanks for calling press 1 for sales, 2 for support, ..."
  14.541 +;exten => s,n,WaitExten
  14.542 +;exten => 1,1,Goto(submenu,s,1)
  14.543 +;exten => 2,1,Hangup
  14.544 +;include => default
  14.545 +;
  14.546 +;[submenu]
  14.547 +;exten => s,1,Ringing					; Make them comfortable with 2 seconds of ringback
  14.548 +;exten => s,n,Wait,2
  14.549 +;exten => s,n,Background(submenuopts)	; "Thanks for calling the sales department.  Press 1 for steve, 2 for..."
  14.550 +;exten => s,n,WaitExten
  14.551 +;exten => 1,1,Goto(default,steve,1)
  14.552 +;exten => 2,1,Goto(default,mark,2)
  14.553 +
  14.554 +;[default]
  14.555 +;
  14.556 +; By default we include the demo.  In a production system, you 
  14.557 +; probably don't want to have the demo there.
  14.558 +;
  14.559 +;include => demo
  14.560 +
  14.561 +;
  14.562 +; An extension like the one below can be used for FWD, Nikotel, sipgate etc.
  14.563 +; Note that you must have a [sipprovider] section in sip.conf
  14.564 +;
  14.565 +;exten => _41X.,1,Dial(SIP/${EXTEN:2}@sipprovider,,r)
  14.566 +
  14.567 +; Real extensions would go here. Generally you want real extensions to be
  14.568 +; 4 or 5 digits long (although there is no such requirement) and start with a
  14.569 +; single digit that is fairly large (like 6 or 7) so that you have plenty of
  14.570 +; room to overlap extensions and menu options without conflict.  You can alias
  14.571 +; them with names, too, and use global variables
  14.572 +
  14.573 +;exten => 6245,hint,SIP/Grandstream1&SIP/Xlite1,Joe Schmoe ; Channel hints for presence
  14.574 +;exten => 6245,1,Dial(SIP/Grandstream1,20,rt)	; permit transfer
  14.575 +;exten => 6245,n(dial),Dial(${HINT},20,rtT)	; Use hint as listed
  14.576 +;exten => 6245,n,Voicemail(6245,u)		; Voicemail (unavailable)
  14.577 +;exten => 6245,s+1,Hangup			; s+1, same as n
  14.578 +;exten => 6245,dial+101,Voicemail(6245,b)	; Voicemail (busy)
  14.579 +;exten => 6361,1,Dial(IAX2/JaneDoe,,rm)		; ring without time limit
  14.580 +;exten => 6389,1,Dial(MGCP/aaln/1@192.168.0.14)
  14.581 +;exten => 6390,1,Dial(JINGLE/caller/callee) ; Dial via jingle using labels
  14.582 +;exten => 6391,1,Dial(JINGLE/asterisk@digium.com/mogorman@astjab.org) ;Dial via jingle using asterisk as the transport and calling mogorman.
  14.583 +;exten => 6394,1,Dial(Local/6275/n)		; this will dial ${MARK}
  14.584 +
  14.585 +;exten => 6275,1,Macro(stdexten,6275,${MARK})	; assuming ${MARK} is something like Zap/2
  14.586 +;exten => mark,1,Goto(6275|1)			; alias mark to 6275
  14.587 +;exten => 6536,1,Macro(stdexten,6236,${WIL})	; Ditto for wil
  14.588 +;exten => wil,1,Goto(6236|1)
  14.589 +
  14.590 +;If you want to subscribe to the status of a parking space, this is
  14.591 +;how you do it. Subscribe to extension 6600 in sip, and you will see
  14.592 +;the status of the first parking lot with this extensions' help
  14.593 +;exten => 6600,hint,park:701@parkedcalls
  14.594 +;exten => 6600,1,noop
  14.595 +;
  14.596 +; Some other handy things are an extension for checking voicemail via
  14.597 +; voicemailmain
  14.598 +;
  14.599 +;exten => 8500,1,VoicemailMain
  14.600 +;exten => 8500,n,Hangup
  14.601 +;
  14.602 +; Or a conference room (you'll need to edit meetme.conf to enable this room)
  14.603 +;
  14.604 +;exten => 8600,1,Meetme(1234)
  14.605 +;
  14.606 +; Or playing an announcement to the called party, as soon it answers
  14.607 +;
  14.608 +;exten = 8700,1,Dial(${MARK},30,A(/path/to/my/announcemsg))
  14.609 +;
  14.610 +; For more information on applications, just type "core show applications" at your
  14.611 +; friendly Asterisk CLI prompt.
  14.612 +;
  14.613 +; "core show application <command>" will show details of how you
  14.614 +; use that particular application in this file, the dial plan. 
  14.615 +; "core show functions" will list all dialplan functions
  14.616 +; "core show function <COMMAND>" will show you more information about
  14.617 +; one function. Remember that function names are UPPER CASE.