[asterisk-commits] oej: branch oej/statechange-7816 r49003 - in /team/oej/statechange-7816: ./ c...

[asterisk-commits at lists.digium.com]

Author: oej
Date: Wed Dec 27 15:24:28 2006
New Revision: 49003

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49003
Log:
reset automerge

Modified:
    team/oej/statechange-7816/   (props changed)
    team/oej/statechange-7816/channels/chan_iax2.c
    team/oej/statechange-7816/channels/chan_sip.c
    team/oej/statechange-7816/funcs/func_math.c

Propchange: team/oej/statechange-7816/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Dec 27 15:24:28 2006
@@ -1,1 +1,1 @@
-/branches/1.2:1-48808
+/branches/1.2:1-49002

Modified: team/oej/statechange-7816/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/team/oej/statechange-7816/channels/chan_iax2.c?view=diff&rev=49003&r1=49002&r2=49003
==============================================================================
--- team/oej/statechange-7816/channels/chan_iax2.c (original)
+++ team/oej/statechange-7816/channels/chan_iax2.c Wed Dec 27 15:24:28 2006
@@ -1260,7 +1260,7 @@
 		return -1;
 	}
 	fwh = mmap(NULL, stbuf.st_size, PROT_READ, MAP_PRIVATE, fd, 0); 
-	if (!fwh) {
+	if (fwh == (void *) -1) {
 		ast_log(LOG_WARNING, "mmap failed: %s\n", strerror(errno));
 		close(fd);
 		return -1;

Modified: team/oej/statechange-7816/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/oej/statechange-7816/channels/chan_sip.c?view=diff&rev=49003&r1=49002&r2=49003
==============================================================================
--- team/oej/statechange-7816/channels/chan_sip.c (original)
+++ team/oej/statechange-7816/channels/chan_sip.c Wed Dec 27 15:24:28 2006
@@ -9714,6 +9714,7 @@
 		if (!ignore)
 			sip_cancel_destroy(p);
 		check_pendings(p);
+		ast_set_flag(p, SIP_CAN_BYE);
 		break;
 	case 180:	/* 180 Ringing */
 		if (!ignore)
@@ -10921,11 +10922,11 @@
 	} else if (p->owner) {
 		ast_queue_hangup(p->owner);
 		if (option_debug > 2)
-			ast_log(LOG_DEBUG, "Received bye, issuing owner hangup\n.");
+			ast_log(LOG_DEBUG, "Received bye, issuing owner hangup\n");
 	} else {
 		ast_set_flag(p, SIP_NEEDDESTROY);	
 		if (option_debug > 2)
-			ast_log(LOG_DEBUG, "Received bye, no owner, selfdestruct soon.\n.");
+			ast_log(LOG_DEBUG, "Received bye, no owner, selfdestruct soon.\n");
 	}
 	transmit_response(p, "200 OK", req);
 

Modified: team/oej/statechange-7816/funcs/func_math.c
URL: http://svn.digium.com/view/asterisk/team/oej/statechange-7816/funcs/func_math.c?view=diff&rev=49003&r1=49002&r2=49003
==============================================================================
--- team/oej/statechange-7816/funcs/func_math.c (original)
+++ team/oej/statechange-7816/funcs/func_math.c Wed Dec 27 15:24:28 2006
@@ -124,7 +124,6 @@
 			iaction = LTEFUNCTION;
 		}
 	} else if ((op = strchr(mvalue1, '='))) {
-		iaction = GTFUNCTION;
 		*op = '\0';
 		if (*(op+1) == '=') {
 			*++op = '\0';