[Asterisk-cvs] asterisk/channels chan_oss.c,1.24,1.25 chan_sip.c,1.358,1.359

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv16084/channels

Modified Files:
	chan_oss.c chan_sip.c 
Log Message:
Let OSS know how to deal with indication -1


Index: chan_oss.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_oss.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- chan_oss.c	7 Apr 2004 16:17:31 -0000	1.24
+++ chan_oss.c	2 May 2004 17:52:45 -0000	1.25
@@ -681,6 +681,9 @@
 	case AST_CONTROL_RINGING:
 		res = 0;
 		break;
+	case -1:
+		cursound = -1;
+		return 0;
 	default:
 		ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, chan->name);
 		return -1;

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- chan_sip.c	2 May 2004 17:43:15 -0000	1.358
+++ chan_sip.c	2 May 2004 17:52:45 -0000	1.359
@@ -6899,7 +6899,7 @@
 		hp = ast_gethostbyname(ourhost, &ahp);
 		if (!hp) {
 			ast_log(LOG_WARNING, "Unable to get IP address for %s, SIP disabled\n", ourhost);
-			if (!__ourip.sin_addr.s_addr)
+			if (!__ourip.s_addr)
 				return 0;
 		} else
 			memcpy(&__ourip, hp->h_addr, sizeof(__ourip));