[svn-commits] tilghman: trunk r284700 - in /trunk: ./ addons/ooh323c/src/oochannels.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Thu Sep  2 11:36:55 2010
New Revision: 284700

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=284700
Log:
Merged revisions 284696 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r284696 | tilghman | 2010-09-02 11:27:52 -0500 (Thu, 02 Sep 2010) | 2 lines
  
  Fixing build
........

Modified:
    trunk/   (props changed)
    trunk/addons/ooh323c/src/oochannels.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/addons/ooh323c/src/oochannels.c
URL: http://svnview.digium.com/svn/asterisk/trunk/addons/ooh323c/src/oochannels.c?view=diff&rev=284700&r1=284699&r2=284700
==============================================================================
--- trunk/addons/ooh323c/src/oochannels.c (original)
+++ trunk/addons/ooh323c/src/oochannels.c Thu Sep  2 11:36:55 2010
@@ -1994,9 +1994,8 @@
       return FALSE;
    }
 
-   if(FD_ISSET(sock, &readfds))
-   {
-      char buf[2];      
+   if (pfds.events & POLLIN) {
+      char buf[2];
       if(ooSocketRecvPeek(sock, (ASN1OCTET*) buf, 2) == 0)
       {
          OOTRACEWARN3("Broken pipe detected. (%s, %s)", call->callType,