[asterisk-commits] branch oej/managerstuff r13282 - in /team/oej/managerstuff: ./ channels/ conf...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Mar 16 14:25:30 2006
New Revision: 13282

URL: http://svn.digium.com/view/asterisk?rev=13282&view=rev
Log:
resolve conflict, reset automerge

Modified:
    team/oej/managerstuff/   (props changed)
    team/oej/managerstuff/ast_expr2.c
    team/oej/managerstuff/ast_expr2.y
    team/oej/managerstuff/channels/chan_zap.c
    team/oej/managerstuff/configs/sip.conf.sample

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/managerstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Mar 16 14:25:30 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-7496,7498-13200
+/branches/1.2:1-7496,7498-13281

Modified: team/oej/managerstuff/ast_expr2.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/ast_expr2.c?rev=13282&r1=13281&r2=13282&view=diff
==============================================================================
--- team/oej/managerstuff/ast_expr2.c (original)
+++ team/oej/managerstuff/ast_expr2.c Thu Mar 16 14:25:30 2006
@@ -142,10 +142,10 @@
 #include <asterisk/ast_expr.h>
 #include <asterisk/logger.h>
 
-#ifdef LONG_LONG_MIN
+#if defined(LONG_LONG_MIN) && !defined(QUAD_MIN)
 #define QUAD_MIN LONG_LONG_MIN
 #endif
-#ifdef LONG_LONG_MAX
+#if defined(LONG_LONG_MAX) && !defined(QUAD_MAX)
 #define QUAD_MAX LONG_LONG_MAX
 #endif
 

Modified: team/oej/managerstuff/ast_expr2.y
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/ast_expr2.y?rev=13282&r1=13281&r2=13282&view=diff
==============================================================================
--- team/oej/managerstuff/ast_expr2.y (original)
+++ team/oej/managerstuff/ast_expr2.y Thu Mar 16 14:25:30 2006
@@ -29,10 +29,10 @@
 #include <asterisk/ast_expr.h>
 #include <asterisk/logger.h>
 
-#ifdef LONG_LONG_MIN
+#if defined(LONG_LONG_MIN) && !defined(QUAD_MIN)
 #define QUAD_MIN LONG_LONG_MIN
 #endif
-#ifdef LONG_LONG_MAX
+#if defined(LONG_LONG_MAX) && !defined(QUAD_MAX)
 #define QUAD_MAX LONG_LONG_MAX
 #endif
 

Modified: team/oej/managerstuff/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/channels/chan_zap.c?rev=13282&r1=13281&r2=13282&view=diff
==============================================================================
--- team/oej/managerstuff/channels/chan_zap.c (original)
+++ team/oej/managerstuff/channels/chan_zap.c Thu Mar 16 14:25:30 2006
@@ -5971,8 +5971,7 @@
 				else
 					number = 0;
 			/* If set to use V23 Signalling, launch our FSK gubbins and listen for it */
-			} else if ((p->cid_signalling == CID_SIG_V23) || (p->cid_signalling == CID_SIG_V23_JP)) {
-
+			} else if (p->cid_signalling == CID_SIG_V23) {
 				cs = callerid_new(p->cid_signalling);
 				if (cs) {
 					samples = 0;
@@ -6167,7 +6166,7 @@
 			}
 		} else if (p->use_callerid && p->cid_start == CID_START_RING) {
 			/* FSK Bell202 callerID */
-			cs = callerid_new(cid_signalling);
+			cs = callerid_new(p->cid_signalling);
 			if (cs) {
 #if 1
 				bump_gains(p);

Modified: team/oej/managerstuff/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/oej/managerstuff/configs/sip.conf.sample?rev=13282&r1=13281&r2=13282&view=diff
==============================================================================
--- team/oej/managerstuff/configs/sip.conf.sample (original)
+++ team/oej/managerstuff/configs/sip.conf.sample Thu Mar 16 14:25:30 2006
@@ -87,6 +87,7 @@
 ;progressinband=never		; If we should generate in-band ringing always
 				; use 'never' to never use in-band signalling, even in cases
 				; where some buggy devices might not render it
+				; Valid values: yes, no, never Default: never
 ;useragent=Asterisk PBX		; Allows you to change the user agent string
 ;promiscredir = no      	; If yes, allows 302 or REDIR to non-local SIP address
 	                       	; Note that promiscredir when redirects are made to the