Changeset 745 for trunk/server/source4/lib/stream/packet.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/lib/stream/packet.c (modified) (5 diffs)

trunk/server/source4/lib/stream/packet.c

@@ -43 +43 @@
         int processing;
         bool recv_disable;
+        bool recv_need_enable;
         bool nofree;
 
@@ -257 +258 @@
 
         if (pc->recv_disable) {
+                pc->recv_need_enable = true;
                 EVENT_FD_NOT_READABLE(pc->fde);
                 return;
@@ -465 +467 @@
 _PUBLIC_ void packet_recv_disable(struct packet_context *pc)
 {
-        EVENT_FD_NOT_READABLE(pc->fde);
         pc->recv_disable = true;
 }
@@ -474 +475 @@
 _PUBLIC_ void packet_recv_enable(struct packet_context *pc)
 {
-        EVENT_FD_READABLE(pc->fde);
+        if (pc->recv_need_enable) {
+                pc->recv_need_enable = false;
+                EVENT_FD_READABLE(pc->fde);
+        }
         pc->recv_disable = false;
         if (pc->num_read != 0 && pc->packet_size >= pc->num_read) {
@@ -527 +531 @@
   call send_callback.  
 
-  Useful for operations that must occour after sending a message, such
+  Useful for operations that must occur after sending a message, such
   as the switch to SASL encryption after as sucessful LDAP bind relpy.
 */