[G15daemon-commits] SF.net SVN: g15daemon: [456] trunk/g15daemon-wip

[<mla...@us...>]

Revision: 456
          http://g15daemon.svn.sourceforge.net/g15daemon/?rev=456&view=rev
Author:   mlampard
Date:     2008-01-27 22:05:31 -0800 (Sun, 27 Jan 2008)

Log Message:
-----------
g15daemon 1.9x: ensure that OOB traffic is kept separate from image buffers in g15_recv().

Modified Paths:
--------------
    trunk/g15daemon-wip/ChangeLog
    trunk/g15daemon-wip/plugins/g15_plugin_net.c

Modified: trunk/g15daemon-wip/ChangeLog
===================================================================
--- trunk/g15daemon-wip/ChangeLog	2008-01-27 06:58:43 UTC (rev 455)
+++ trunk/g15daemon-wip/ChangeLog	2008-01-28 06:05:31 UTC (rev 456)
@@ -166,3 +166,6 @@
 1.9.5.2:
 - BugFix: IS_USER_SELECTED client command was broken. fix it.
 - BugFix: restore client ability to change backlight state.
+SVN:
+- BugFix: plugins/g15daemon_net.c: ensure that OOB traffic is not mixed with
+          normal image buffers.

Modified: trunk/g15daemon-wip/plugins/g15_plugin_net.c
===================================================================
--- trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-27 06:58:43 UTC (rev 455)
+++ trunk/g15daemon-wip/plugins/g15_plugin_net.c	2008-01-28 06:05:31 UTC (rev 456)
@@ -219,7 +219,7 @@
                 }
            	process_client_cmds(lcdnode, sock, msgbuf,len);
             }
-            else if(pfd[0].revents & POLLIN && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL)) {
+            else if(pfd[0].revents & POLLIN && !(pfd[0].revents & POLLERR || pfd[0].revents & POLLHUP || pfd[0].revents & POLLNVAL || pfd[0].revents & POLLPRI)) {
 
                 retval = recv(sock, buf+total, bytesleft, 0);
                 if (retval < 1) { 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.