Changeset 988 for vendor/current/source4/lib/stream

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

Location:

vendor/current/source4/lib/stream

Files:

• packet.c (modified) (10 diffs)
• packet.h (modified) (1 diff)

vendor/current/source4/lib/stream/packet.c

@@ -252 +252 @@
 
         if (pc->processing) {
-                EVENT_FD_NOT_READABLE(pc->fde);
+                TEVENT_FD_NOT_READABLE(pc->fde);
                 pc->processing++;
                 return;
@@ -259 +259 @@
         if (pc->recv_disable) {
                 pc->recv_need_enable = true;
-                EVENT_FD_NOT_READABLE(pc->fde);
+                TEVENT_FD_NOT_READABLE(pc->fde);
                 return;
         }
@@ -425 +425 @@
         if (pc->processing) {
                 if (pc->processing > 1) {
-                        EVENT_FD_READABLE(pc->fde);
+                        TEVENT_FD_READABLE(pc->fde);
                 }
                 pc->processing = 0;
@@ -458 +458 @@
         }
 
-        event_add_timed(pc->ev, pc, timeval_zero(), packet_next_event, pc);
+        tevent_add_timer(pc->ev, pc, timeval_zero(), packet_next_event, pc);
 }
 
@@ -477 +477 @@
         if (pc->recv_need_enable) {
                 pc->recv_need_enable = false;
-                EVENT_FD_READABLE(pc->fde);
+                TEVENT_FD_READABLE(pc->fde);
         }
         pc->recv_disable = false;
         if (pc->num_read != 0 && pc->packet_size >= pc->num_read) {
-                event_add_timed(pc->ev, pc, timeval_zero(), packet_next_event, pc);
+                tevent_add_timer(pc->ev, pc, timeval_zero(), packet_next_event, pc);
         }
 }
@@ -524 +524 @@
         /* we're out of requests to send, so don't wait for write
            events any more */
-        EVENT_FD_NOT_WRITEABLE(pc->fde);
+        TEVENT_FD_NOT_WRITEABLE(pc->fde);
 }
 
@@ -542 +542 @@
         NT_STATUS_HAVE_NO_MEMORY(el);
 
-        DLIST_ADD_END(pc->send_queue, el, struct send_element *);
+        DLIST_ADD_END(pc->send_queue, el);
         el->blob = blob;
         el->nsent = 0;
@@ -562 +562 @@
         }
 
-        EVENT_FD_WRITEABLE(pc->fde);
+        TEVENT_FD_WRITEABLE(pc->fde);
 
         return NT_STATUS_OK;
@@ -584 +584 @@
                 return STATUS_MORE_ENTRIES;
         }
-        *size = 4 + smb_len(blob.data);
+        /*
+         * Note: that we use smb_len_tcp() instead
+         *       of smb_len_nbt() as this function is not
+         *       used for nbt and the source4 copy
+         *       of smb_len() was smb_len_tcp()
+         */
+        *size = 4 + smb_len_tcp(blob.data);
         if (*size > blob.length) {
                 return STATUS_MORE_ENTRIES;
@@ -607 +613 @@
         return NT_STATUS_OK;
 }
+
+_PUBLIC_ NTSTATUS packet_full_request_u16(void *private_data, DATA_BLOB blob, size_t *size)
+{
+        if (blob.length < 2) {
+                return STATUS_MORE_ENTRIES;
+        }
+        *size = 2 + RSVAL(blob.data, 0);
+        if (*size > blob.length) {
+                return STATUS_MORE_ENTRIES;
+        }
+        return NT_STATUS_OK;
+}

vendor/current/source4/lib/stream/packet.h

@@ -62 +62 @@
 NTSTATUS packet_full_request_nbt(void *private_data, DATA_BLOB blob, size_t *size);
 NTSTATUS packet_full_request_u32(void *private_data, DATA_BLOB blob, size_t *size);
+NTSTATUS packet_full_request_u16(void *private_data, DATA_BLOB blob, size_t *size);