[asterisk-commits] branch oej/metermaids - r7934 in /team/oej/metermaids: ./ apps/ channels/ cha...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Jan 10 02:22:38 CST 2006 

Author: oej
Date: Tue Jan 10 02:22:31 2006
New Revision: 7934

URL: http://svn.digium.com/view/asterisk?rev=7934&view=rev
Log:
Merged revisions 7490,7517,7529,7546,7550,7552,7557,7580,7586,7595,7605,7641,7663,7706,7738,7771,7792,7812,7870-7871,7898-7900,7904,7908 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7490 | crichter | 2005-12-15 11:52:30 +0100 (Thu, 15 Dec 2005) | 9 lines

* Added mISDN/mISDNuser Echo cancel Patch
* Fixed Makefiles so that chan_misdn can be compiled again
* added some hints, that mISDN cannot be compiled against gcc-4, SMP, Spinlock Debug
* fixed some Minor issues in chan_misdn, regarding Type Of Number and Presentation





........
r7517 | tilghman | 2005-12-17 18:19:32 +0100 (Sat, 17 Dec 2005) | 2 lines

Bug 6009 - off by one error

........
r7529 | russell | 2005-12-20 00:47:23 +0100 (Tue, 20 Dec 2005) | 5 lines

I messed up and accidently committed this to the trunk first ...
- add note on required values of sip_methods struct
- remove duplicate function prototype
- remove duplicate ast_mutex_lock (issue #6025)

........
r7546 | kpfleming | 2005-12-20 13:58:37 +0100 (Tue, 20 Dec 2005) | 2 lines

backport fix for larger-than-20ms-frames from trunk (bug #5697)

........
r7550 | russell | 2005-12-20 18:34:00 +0100 (Tue, 20 Dec 2005) | 2 lines

backport fix for segfault on directed pickup when no CDR is available (issue #5998)

........
r7552 | russell | 2005-12-20 19:05:45 +0100 (Tue, 20 Dec 2005) | 2 lines

backport fix for reloading peer context (issue #6007)

........
r7557 | russell | 2005-12-20 21:21:26 +0100 (Tue, 20 Dec 2005) | 2 lines

check array bounds when parsing arguments to AGI (issue #5868)

........
r7580 | bweschke | 2005-12-21 20:53:49 +0100 (Wed, 21 Dec 2005) | 3 lines

Bug #6040 - Documentation correction


........
r7586 | twisted | 2005-12-21 23:23:39 +0100 (Wed, 21 Dec 2005) | 3 lines

Actually put in the per-peer settings for sip video, as they didn't make it in at astricon somehow, and I've been too busy up until now to redo it.


........
r7595 | russell | 2005-12-22 17:17:43 +0100 (Thu, 22 Dec 2005) | 2 lines

remove stray unlock (issue #5955)

........
r7605 | bweschke | 2005-12-23 01:00:11 +0100 (Fri, 23 Dec 2005) | 3 lines

 Another app documentation tweak.


........
r7641 | kpfleming | 2005-12-27 01:07:45 +0100 (Tue, 27 Dec 2005) | 2 lines

backport fix to ensure that DSP is never enabled on pseudo channels

........
r7663 | russell | 2005-12-27 22:07:08 +0100 (Tue, 27 Dec 2005) | 2 lines

backport fix for permissions of created recordings (issue #6067)

........
r7706 | bweschke | 2006-01-02 03:04:14 +0100 (Mon, 02 Jan 2006) | 3 lines

 Fix compiler warnings.


........
r7738 | kpfleming | 2006-01-03 18:00:01 +0100 (Tue, 03 Jan 2006) | 2 lines

backport rport scanning fix from trunk (bug #6071)

........
r7771 | bweschke | 2006-01-04 06:27:38 +0100 (Wed, 04 Jan 2006) | 3 lines

 Fix the 'if' clause to be true under the right conditions. Bug #6126


........
r7792 | oej | 2006-01-04 22:43:14 +0100 (Wed, 04 Jan 2006) | 2 lines

Fixing typo in XML for video updates.

........
r7812 | oej | 2006-01-05 10:13:21 +0100 (Thu, 05 Jan 2006) | 2 lines

Fix copyright of changed file

........
r7870 | russell | 2006-01-09 05:52:16 +0100 (Mon, 09 Jan 2006) | 2 lines

backport fix for unnecessary unlock (issue #6171)

........
r7871 | russell | 2006-01-09 06:11:44 +0100 (Mon, 09 Jan 2006) | 2 lines

fix seg fault when using greek syntax in VoicemMailMain (issue #6142)

........
r7898 | kpfleming | 2006-01-09 19:08:07 +0100 (Mon, 09 Jan 2006) | 2 lines

fix breakage introduced in revision 7871

........
r7899 | kpfleming | 2006-01-09 19:09:53 +0100 (Mon, 09 Jan 2006) | 2 lines

backport fix from revision 7856 of trunk

........
r7900 | kpfleming | 2006-01-09 19:11:23 +0100 (Mon, 09 Jan 2006) | 2 lines

commit user/group-related changes from trunk

........
r7904 | tilghman | 2006-01-09 19:37:50 +0100 (Mon, 09 Jan 2006) | 2 lines

Update variable documentation to match the code

........
r7908 | tilghman | 2006-01-09 21:08:24 +0100 (Mon, 09 Jan 2006) | 2 lines

Bug 6157 - Memory leak

........

Added:
    team/oej/metermaids/channels/misdn/mISDN.patch
      - copied unchanged from r7490, branches/1.2/channels/misdn/mISDN.patch
    team/oej/metermaids/channels/misdn/mISDNuser.patch
      - copied unchanged from r7490, branches/1.2/channels/misdn/mISDNuser.patch
Modified:
    team/oej/metermaids/   (props changed)
    team/oej/metermaids/apps/app_voicemail.c
    team/oej/metermaids/channels/Makefile
    team/oej/metermaids/channels/chan_sip.c
    team/oej/metermaids/doc/README.variables
    team/oej/metermaids/pbx/pbx_spool.c
    team/oej/metermaids/res/res_agi.c

Propchange: team/oej/metermaids/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 10 02:22:31 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7489,7491-7496,7498-7516,7518-7528,7530-7545,7547-7549,7551,7553-7556,7558-7579,7581-7585,7587-7594,7596-7604,7606-7640,7642-7662,7664-7705,7707-7737,7739-7770,7772-7791,7793-7811,7813-7829,7831,7848
+/branches/1.2:1-7496,7498-7913

Modified: team/oej/metermaids/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/apps/app_voicemail.c?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/apps/app_voicemail.c (original)
+++ team/oej/metermaids/apps/app_voicemail.c Tue Jan 10 02:22:31 2006
@@ -3899,8 +3899,8 @@
 {
 	int cmd;
 	char *buf;
+
 	buf = alloca(strlen(mbox)+2); 
-	memset(buf, '\0', sizeof(char)*(sizeof(buf)));
 	strcpy(buf, mbox);
 	strcat(buf,"s");
 

Modified: team/oej/metermaids/channels/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/channels/Makefile?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/channels/Makefile (original)
+++ team/oej/metermaids/channels/Makefile Tue Jan 10 02:22:31 2006
@@ -229,7 +229,7 @@
 endif
 
 chan_misdn.so: chan_misdn.o chan_misdn_config.o misdn/chan_misdn_lib.a
-	$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lisdnnet -lmISDN
+	$(CC) -shared -Xlinker -x -L/usr/lib -o $@ $^ -lmISDN -lisdnnet
 
 chan_misdn.o: chan_misdn.c
 	$(CC) $(CFLAGS) -DCHAN_MISDN_VERSION=\"0.2.1\" -c $< -o $@

Modified: team/oej/metermaids/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/channels/chan_sip.c?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/channels/chan_sip.c (original)
+++ team/oej/metermaids/channels/chan_sip.c Tue Jan 10 02:22:31 2006
@@ -421,8 +421,6 @@
 static struct sockaddr_in debugaddr;
 
 static int tos = 0;
-
-static int videosupport = 0;
 
 static int compactheaders = 0;				/*!< send compact sip headers */
 
@@ -567,11 +565,13 @@
 #define SIP_CALL_LIMIT		(1 << 29)
 /* Remote Party-ID Support */
 #define SIP_SENDRPID		(1 << 30)
+/* SIP Video Options */
+#define SIP_VIDEOSUPPORT	(1 << 31)
 
 #define SIP_FLAGS_TO_COPY \
 	(SIP_PROMISCREDIR | SIP_TRUSTRPID | SIP_SENDRPID | SIP_DTMF | SIP_REINVITE | \
 	 SIP_PROG_INBAND | SIP_OSPAUTH | SIP_USECLIENTCODE | SIP_NAT | \
-	 SIP_INSECURE_PORT | SIP_INSECURE_INVITE)
+	 SIP_INSECURE_PORT | SIP_INSECURE_INVITE | SIP_VIDEOSUPPORT)
 
 /* a new page of flags for peer */
 #define SIP_PAGE2_RTCACHEFRIENDS	(1 << 0)
@@ -2794,8 +2794,7 @@
 	else if (i->capability)
 		what = i->capability;
 	else
-		what = global_capability;
-	tmp->nativeformats = ast_codec_choose(&i->prefs, what, 1) | (i->jointcapability & AST_FORMAT_VIDEO_MASK);
+		tmp->nativeformats = ast_codec_choose(&i->prefs, global_capability, 1);
 	fmt = ast_best_codec(tmp->nativeformats);
 
 	if (title)
@@ -3134,10 +3133,10 @@
 
 	if (sip_methods[intended_method].need_rtp) {
 		p->rtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
-		if (videosupport)
+		if (ast_test_flag(p, SIP_VIDEOSUPPORT))
 			p->vrtp = ast_rtp_new_with_bindaddr(sched, io, 1, 0, bindaddr.sin_addr);
-		if (!p->rtp || (videosupport && !p->vrtp)) {
-			ast_log(LOG_WARNING, "Unable to create RTP audio %s session: %s\n", videosupport ? "and video" : "", strerror(errno));
+		if (!p->rtp || (ast_test_flag(p, SIP_VIDEOSUPPORT) && !p->vrtp)) {
+			ast_log(LOG_WARNING, "Unable to create RTP audio %s session: %s\n", ast_test_flag(p, SIP_VIDEOSUPPORT) ? "and video" : "", strerror(errno));
 			ast_mutex_destroy(&p->lock);
 			if (p->chanvars) {
 				ast_variables_destroy(p->chanvars);
@@ -4510,7 +4509,7 @@
 	}
 
 	/* Now send any other common codecs, and non-codec formats: */
-	for (x = 1; x <= ((videosupport && p->vrtp) ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
+	for (x = 1; x <= ((ast_test_flag(p, SIP_VIDEOSUPPORT) && p->vrtp) ? AST_FORMAT_MAX_VIDEO : AST_FORMAT_MAX_AUDIO); x <<= 1) {
 		if (!(capability & x))
 			continue;
 
@@ -7640,6 +7639,7 @@
 			"IPport: %d\r\n"
 			"Dynamic: %s\r\n"
 			"Natsupport: %s\r\n"
+			"Video Support: %s\r\n"
 			"ACL: %s\r\n"
 			"Status: %s\r\n\r\n", 
 			idtext,
@@ -7648,6 +7648,7 @@
 			ntohs(iterator->addr.sin_port), 
 			ast_test_flag(iterator, SIP_DYNAMIC) ? "yes" : "no",  /* Dynamic or not? */
 			(ast_test_flag(iterator, SIP_NAT) & SIP_NAT_ROUTE) ? "yes" : "no",	/* NAT=yes? */
+			ast_test_flag(iterator, SIP_VIDEOSUPPORT) ? "yes" : "no",	/* VIDEOSUPPORT=yes? */
 			iterator->ha ? "yes" : "no",       /* permit/deny */
 			status);
 		}
@@ -8028,6 +8029,7 @@
 		ast_cli(fd, "  CanReinvite  : %s\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Yes":"No"));
 		ast_cli(fd, "  PromiscRedir : %s\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Yes":"No"));
 		ast_cli(fd, "  User=Phone   : %s\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Yes":"No"));
+		ast_cli(fd, "  Video Support: %s\n", (ast_test_flag(peer, SIP_VIDEOSUPPORT)?"Yes":"No"));
 		ast_cli(fd, "  Trust RPID   : %s\n", (ast_test_flag(peer, SIP_TRUSTRPID) ? "Yes" : "No"));
 		ast_cli(fd, "  Send RPID    : %s\n", (ast_test_flag(peer, SIP_SENDRPID) ? "Yes" : "No"));
 
@@ -8104,6 +8106,7 @@
 		ast_cli(fd, "SIP-CanReinvite: %s\r\n", (ast_test_flag(peer, SIP_CAN_REINVITE)?"Y":"N"));
 		ast_cli(fd, "SIP-PromiscRedir: %s\r\n", (ast_test_flag(peer, SIP_PROMISCREDIR)?"Y":"N"));
 		ast_cli(fd, "SIP-UserPhone: %s\r\n", (ast_test_flag(peer, SIP_USEREQPHONE)?"Y":"N"));
+		ast_cli(fd, "SIP-VideoSupport: %s\r\n", (ast_test_flag(peer, SIP_VIDEOSUPPORT)?"Y":"N"));
 
 		/* - is enumerated */
 		ast_cli(fd, "SIP-DTMFmode %s\r\n", dtmfmode2str(ast_test_flag(peer, SIP_DTMF)));
@@ -8250,7 +8253,7 @@
 	ast_cli(fd, "----------------\n");
 	ast_cli(fd, "  SIP Port:               %d\n", ntohs(bindaddr.sin_port));
 	ast_cli(fd, "  Bindaddress:            %s\n", ast_inet_ntoa(tmp, sizeof(tmp), bindaddr.sin_addr));
-	ast_cli(fd, "  Videosupport:           %s\n", videosupport ? "Yes" : "No");
+	ast_cli(fd, "  Videosupport:           %s\n", ast_test_flag(&global_flags, SIP_VIDEOSUPPORT) ? "Yes" : "No");
 	ast_cli(fd, "  AutoCreatePeer:         %s\n", autocreatepeer ? "Yes" : "No");
 	ast_cli(fd, "  Allow unknown access:   %s\n", global_allowguest ? "Yes" : "No");
 	ast_cli(fd, "  Promsic. redir:         %s\n", ast_test_flag(&global_flags, SIP_PROMISCREDIR) ? "Yes" : "No");
@@ -12191,6 +12194,8 @@
 			ast_copy_string(peer->fromdomain, v->value, sizeof(peer->fromdomain));
 		else if (!strcasecmp(v->name, "usereqphone"))
 			ast_set2_flag(peer, ast_true(v->value), SIP_USEREQPHONE);
+		else if (!strcasecmp(v->name, "videosupport"))
+			ast_set2_flag(peer, ast_true(v->value), SIP_VIDEOSUPPORT);
 		else if (!strcasecmp(v->name, "fromuser"))
 			ast_copy_string(peer->fromuser, v->value, sizeof(peer->fromuser));
 		else if (!strcasecmp(v->name, "host") || !strcasecmp(v->name, "outboundproxy")) {
@@ -12395,7 +12400,6 @@
 	memset(&outboundproxyip, 0, sizeof(outboundproxyip));
 	outboundproxyip.sin_port = htons(DEFAULT_SIP_PORT);
 	outboundproxyip.sin_family = AF_INET;	/* Type of address: IPv4 */
-	videosupport = 0;
 	compactheaders = 0;
 	dumphistory = 0;
 	recordhistory = 0;
@@ -12476,7 +12480,7 @@
 				global_rtpkeepalive = 0;
 			}
 		} else if (!strcasecmp(v->name, "videosupport")) {
-			videosupport = ast_true(v->value);
+			ast_set2_flag((&global_flags), ast_true(v->value), SIP_VIDEOSUPPORT);
 		} else if (!strcasecmp(v->name, "compactheaders")) {
 			compactheaders = ast_true(v->value);
 		} else if (!strcasecmp(v->name, "notifymimetype")) {

Modified: team/oej/metermaids/doc/README.variables
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/doc/README.variables?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/doc/README.variables (original)
+++ team/oej/metermaids/doc/README.variables Tue Jan 10 02:22:31 2006
@@ -558,25 +558,25 @@
 only read in the dialplan.  Writes to such variables are silently 
 ignored.
 
-${ACCOUNTCODE} 	 	* Account code (if specified)
+${ACCOUNTCODE} 	 	* Account code (if specified) (Deprecated; use ${CDR(accountcode)})
 ${BLINDTRANSFER} 	The name of the channel on the other side of a blind transfer
 ${BRIDGEPEER}	 	Bridged peer
-${CALLERANI}	 	* Caller ANI (PRI channels)
-${CALLERID}	 	* Caller ID
-${CALLERIDNAME}	 	* Caller ID Name only
-${CALLERIDNUM}	 	* Caller ID Number only
+${CALLERANI}	 	* Caller ANI (PRI channels) (Deprecated; use ${CALLERID(ani)})
+${CALLERID}	 	* Caller ID (Deprecated; use ${CALLERID(all)})
+${CALLERIDNAME}	 	* Caller ID Name only (Deprecated; use ${CALLERID(name)})
+${CALLERIDNUM}	 	* Caller ID Number only (Deprecated; use ${CALLERID(num)})
 ${CALLINGANI2}	 	* Caller ANI2 (PRI channels)
 ${CALLINGPRES}	 	* Caller ID presentation for incoming calls (PRI channels)
 ${CALLINGTNS} 	 	* Transit Network Selector (PRI channels)
 ${CALLINGTON}    	* Caller Type of Number (PRI channels)
 ${CHANNEL}	 	* Current channel name
 ${CONTEXT}       	* Current context
-${DATETIME}	 	* Current date time in the format: DDMMYYYY-HH:MM:SS
+${DATETIME}	 	* Current date time in the format: DDMMYYYY-HH:MM:SS (Deprecated; use ${STRFTIME(${EPOCH},,%d%m%Y-%H:%M:%S)})
 ${DB_RESULT}		Result value of DB_EXISTS() dial plan function
-${DNID}          	* Dialed Number Identifier
+${DNID}          	* Dialed Number Identifier (Deprecated; use ${CALLERID(dnid)})
 ${EPOCH}	 	* Current unix style epoch
 ${EXTEN}	 	* Current extension
-${ENV(VAR)}	 	* Environmental variable VAR
+${ENV(VAR)}	 	Environmental variable VAR
 ${GOTO_ON_BLINDXFR}	Transfer to the specified context/extension/priority
 			after a blind transfer (use ^ characters in place of
 			| to separate context/extension/priority when setting
@@ -585,12 +585,12 @@
 ${HINT}          	* Channel hints for this extension
 ${HINTNAME}      	* Suggested Caller*ID name for this extension
 ${INVALID_EXTEN} 	The invalid called extension (used in the "i" extension)
-${LANGUAGE}	 	* Current language
+${LANGUAGE}	 	* Current language (Deprecated; use ${LANGUAGE()})
 ${LEN(VAR)}	 	* String length of VAR (integer)
 ${PRIORITY}	 	* Current priority in the dialplan
 ${PRIREDIRECTREASON} 	Reason for redirect on PRI, if a call was directed
-${RDNIS}         	* Redirected Dial Number ID Service
-${TIMESTAMP}	 	* Current date time in the format: YYYYMMDD-HHMMSS
+${RDNIS}         	* Redirected Dial Number ID Service (Deprecated; use ${CALLERID(rdnis)})
+${TIMESTAMP}	 	* Current date time in the format: YYYYMMDD-HHMMSS (Deprecated; use ${STRFTIME(${EPOCH},,%Y%m%d-%H%M%S)})
 ${TRANSFER_CONTEXT} 	Context for transferred calls
 ${UNIQUEID}	 	* Current call unique identifier
 
@@ -787,8 +787,8 @@
 
 
 In addition, you can set your own extra variables with a traditional
-SetVAR(CDR(var)=val) to anything you want.
-
-Certain functional variables may be accessed with $(foo <args>).  A list
+Set(CDR(var)=val) to anything you want.
+
+Certain functional variables may be accessed with ${foo(<args>)}.  A list
 of these functional variables may be found by typing "show functions"
 at the Asterisk CLI.

Modified: team/oej/metermaids/pbx/pbx_spool.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/pbx/pbx_spool.c?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/pbx/pbx_spool.c (original)
+++ team/oej/metermaids/pbx/pbx_spool.c Tue Jan 10 02:22:31 2006
@@ -312,8 +312,10 @@
 #endif
 				fclose(f);
 				if (o->retries <= o->maxretries) {
+					now += o->retrytime;
 					if (o->callingpid && (o->callingpid == ast_mainpid)) {
 						safe_append(o, time(NULL), "DelayedRetry");
+						free_outgoing(o);
 						ast_log(LOG_DEBUG, "Delaying retry since we're currently running '%s'\n", o->fn);
 					} else {
 						/* Increment retries */
@@ -326,7 +328,6 @@
 						safe_append(o, now, "StartRetry");
 						launch_service(o);
 					}
-					now += o->retrytime;
 					return now;
 				} else {
 					ast_log(LOG_EVENT, "Queued call to %s/%s expired without completion after %d attempt%s\n", o->tech, o->dest, o->retries - 1, ((o->retries - 1) != 1) ? "s" : "");

Modified: team/oej/metermaids/res/res_agi.c
URL: http://svn.digium.com/view/asterisk/team/oej/metermaids/res/res_agi.c?rev=7934&r1=7933&r2=7934&view=diff
==============================================================================
--- team/oej/metermaids/res/res_agi.c (original)
+++ team/oej/metermaids/res/res_agi.c Tue Jan 10 02:22:31 2006
@@ -1994,7 +1994,7 @@
 	ast_copy_string(buf, data, sizeof(buf));
 
 	memset(&agi, 0, sizeof(agi));
-        while ((stringp = strsep(&tmp, "|")) && argc < MAX_ARGS-1)
+        while ((stringp = strsep(&tmp, "|")) && argc < MAX_ARGS - 1)
 		argv[argc++] = stringp;
 	argv[argc] = NULL;

More information about the asterisk-commits mailing list