r1703: - Lots of RPC updates, adding new pipes and protocols.

[nivanova/samba-autobuild/.git] / source4 / build / pidl / packet-dcerpc-eparser.c

diff --git a/source4/build/pidl/packet-dcerpc-eparser.c b/source4/build/pidl/packet-dcerpc-eparser.c
index bef5d826469cbedd10e3ec4e8fc1161b89eb2315..bf2b6e798169af810bbc00de9dccd19ab7c327c1 100644 (file)
--- a/source4/build/pidl/packet-dcerpc-eparser.c
+++ b/source4/build/pidl/packet-dcerpc-eparser.c
@@ -113,14 +113,33 @@ void ndr_pull_uint64(struct e_ndr_pull *ndr, proto_tree *tree, int hf,
 
 void ndr_pull_DATA_BLOB(struct e_ndr_pull *ndr, proto_tree *tree, int hf, gDATA_BLOB *h)
 {
-       guint32 len1, ofs, len2;
-       char *data;
+       guint32 length;
 
        if (!(ndr_flags & NDR_SCALARS)) {
                return;
        }
 
-       /* FIXME */
+       if (ndr->flags & LIBNDR_ALIGN_FLAGS) {
+               if (ndr->flags & LIBNDR_FLAG_ALIGN2) {
+                       length = NDR_ALIGN(ndr, 2);
+               } else if (ndr->flags & LIBNDR_FLAG_ALIGN4) {
+                       length = NDR_ALIGN(ndr, 4);
+               } else if (ndr->flags & LIBNDR_FLAG_ALIGN8) {
+                       length = NDR_ALIGN(ndr, 8);
+               }
+               if (ndr->data_size - ndr->offset < length) {
+                       length = ndr->data_size - ndr->offset;
+               }
+       } else if (ndr->flags & LIBNDR_FLAG_REMAINING) {
+               length = ndr->data_size - ndr->offset;
+       } else {
+               ndr_pull_uint32(ndr, &length);
+       }
+
+       h->data = g_malloc(length);
+       proto_tree_add_bytes(tree, hf_bytes_data, ndr->tvb, ndr->offset, length, h->data);
+       
+    ndr->offset += length;
 }
 
 void ndr_pull_string(struct e_ndr_pull *ndr, proto_tree *tree, int ndr_flags)