[asterisk-commits] coreyfarrell: branch 12 r406935 - in /branches/12: ./ main/ res/

[SVN commits to the Asterisk project]

Author: coreyfarrell
Date: Thu Jan 30 14:34:43 2014
New Revision: 406935

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=406935
Log:
res_rtp_asterisk & udptl: fix port selection to work with SELinux restrictions

ast_bind to a port reserved for another program by SELinux causes
errno == EACCES.  This caused random failures when binding rtp or
udptl sockets.  Treat EACCES as a non-fatal error, try next port.

(closes issue ASTERISK-23134)
Reported by: Corey Farrell
........

Merged revisions 406933 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 406934 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    branches/12/   (props changed)
    branches/12/main/udptl.c
    branches/12/res/res_rtp_asterisk.c

Propchange: branches/12/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: branches/12/main/udptl.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/main/udptl.c?view=diff&rev=406935&r1=406934&r2=406935
==============================================================================
--- branches/12/main/udptl.c (original)
+++ branches/12/main/udptl.c Thu Jan 30 14:34:43 2014
@@ -1051,7 +1051,7 @@
 		if (ast_bind(udptl->fd, &udptl->us) == 0) {
 			break;
 		}
-		if (errno != EADDRINUSE) {
+		if (errno != EADDRINUSE && errno != EACCES) {
 			ast_log(LOG_WARNING, "Unexpected bind error: %s\n", strerror(errno));
 			close(udptl->fd);
 			ast_free(udptl);

Modified: branches/12/res/res_rtp_asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_rtp_asterisk.c?view=diff&rev=406935&r1=406934&r2=406935
==============================================================================
--- branches/12/res/res_rtp_asterisk.c (original)
+++ branches/12/res/res_rtp_asterisk.c Thu Jan 30 14:34:43 2014
@@ -1822,7 +1822,7 @@
 		}
 
 		/* See if we ran out of ports or if the bind actually failed because of something other than the address being in use */
-		if (x == startplace || errno != EADDRINUSE) {
+		if (x == startplace || (errno != EADDRINUSE && errno != EACCES)) {
 			ast_log(LOG_ERROR, "Oh dear... we couldn't allocate a port for RTP instance '%p'\n", instance);
 			close(rtp->s);
 			ast_free(rtp);