librpc/ndr: add support for XPRESS decompression

Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit 6a9720c99d36a575ea8ed92e94ff6d2fe6f3e27d)

diff --git a/source4/librpc/ndr/ndr_compression.c b/source4/librpc/ndr/ndr_compression.c
index 86a5a2560ef2ba400309dbd151d2710475989f1c..ffa37f61a321d3b3d491b15a6715e2d0952058e0 100644 (file)
--- a/source4/librpc/ndr/ndr_compression.c
+++ b/source4/librpc/ndr/ndr_compression.c
@@ -4,6 +4,7 @@
    libndr compression support
 
    Copyright (C) Stefan Metzmacher 2005
+   Copyright (C) Matthieu Suiche 2008
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,6 +22,7 @@
 
 #include "includes.h"
 #include "lib/compression/mszip.h"
+#include "lib/compression/lzxpress.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_compression.h"
 
@@ -158,12 +160,12 @@ static enum ndr_err_code ndr_pull_compression_xpress_chunk(struct ndr_pull *ndrp
                                                  bool *last)
 {
        DATA_BLOB comp_chunk;
+       DATA_BLOB plain_chunk;
        uint32_t comp_chunk_offset;
+       uint32_t plain_chunk_offset;
        uint32_t comp_chunk_size;
        uint32_t plain_chunk_size;
 
-       comp_chunk_offset = ndrpull->offset;
-
        NDR_CHECK(ndr_pull_uint32(ndrpull, NDR_SCALARS, &plain_chunk_size));
        if (plain_chunk_size > 0x00010000) {
                return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION, "Bad XPRESS plain chunk size %08X > 0x00010000 (PULL)", 
@@ -172,15 +174,21 @@ static enum ndr_err_code ndr_pull_compression_xpress_chunk(struct ndr_pull *ndrp
 
        NDR_CHECK(ndr_pull_uint32(ndrpull, NDR_SCALARS, &comp_chunk_size));
 
+       comp_chunk_offset = ndrpull->offset;
        NDR_CHECK(ndr_pull_advance(ndrpull, comp_chunk_size));
-       comp_chunk.length = comp_chunk_size + 8;
+       comp_chunk.length = comp_chunk_size;
        comp_chunk.data = ndrpull->data + comp_chunk_offset;
 
+       plain_chunk_offset = ndrpush->offset;
+       NDR_CHECK(ndr_push_zero(ndrpush, plain_chunk_size));
+       plain_chunk.length = plain_chunk_size;
+       plain_chunk.data = ndrpush->data + plain_chunk_offset;
+
        DEBUG(10,("XPRESS plain_chunk_size: %08X (%u) comp_chunk_size: %08X (%u)\n",
                  plain_chunk_size, plain_chunk_size, comp_chunk_size, comp_chunk_size));
 
-       /* For now, we just copy over the compressed blob */
-       NDR_CHECK(ndr_push_bytes(ndrpush, comp_chunk.data, comp_chunk.length));
+       /* Uncompressing the buffer using LZ Xpress algorithm */
+       lzxpress_decompress(&comp_chunk, &plain_chunk);
 
        if ((plain_chunk_size < 0x00010000) || (ndrpull->offset+4 >= ndrpull->data_size)) {
                /* this is the last chunk */
@@ -197,6 +205,10 @@ static enum ndr_err_code ndr_pull_compression_xpress(struct ndr_pull *subndr,
        struct ndr_push *ndrpush;
        struct ndr_pull *comndr;
        DATA_BLOB uncompressed;
+       uint32_t payload_header[4];
+       uint32_t payload_size;
+       uint32_t payload_offset;
+       uint8_t *payload;
        bool last = false;
 
        ndrpush = ndr_push_init_ctx(subndr, subndr->iconv_convenience);
@@ -207,6 +219,13 @@ static enum ndr_err_code ndr_pull_compression_xpress(struct ndr_pull *subndr,
        }
 
        uncompressed = ndr_push_blob(ndrpush);
+       if (uncompressed.length != decompressed_len) {
+               return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
+                                     "Bad XPRESS uncompressed_len [%u] != [%u](0x%08X) (PULL)",
+                                     (int)uncompressed.length,
+                                     (int)decompressed_len,
+                                     (int)decompressed_len);
+       }
 
        comndr = talloc_zero(subndr, struct ndr_pull);
        NDR_ERR_HAVE_NO_MEMORY(comndr);
@@ -219,6 +238,38 @@ static enum ndr_err_code ndr_pull_compression_xpress(struct ndr_pull *subndr,
 
        comndr->iconv_convenience = talloc_reference(comndr, subndr->iconv_convenience);
 
+       NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[0]));
+       NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[1]));
+       NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[2]));
+       NDR_CHECK(ndr_pull_uint32(comndr, NDR_SCALARS, &payload_header[3]));
+
+       if (payload_header[0] != 0x00081001) {
+               return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
+                                     "Bad XPRESS payload_header[0] [0x%08X] != [0x00081001] (PULL)",
+                                     payload_header[0]);
+       }
+       if (payload_header[1] != 0xCCCCCCCC) {
+               return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
+                                     "Bad XPRESS payload_header[1] [0x%08X] != [0xCCCCCCCC] (PULL)",
+                                     payload_header[1]);
+       }
+
+       payload_size = payload_header[2];
+
+       if (payload_header[3] != 0x00000000) {
+               return ndr_pull_error(subndr, NDR_ERR_COMPRESSION,
+                                     "Bad XPRESS payload_header[3] [0x%08X] != [0x00000000] (PULL)",
+                                     payload_header[3]);
+       }
+
+       payload_offset = comndr->offset;
+       NDR_CHECK(ndr_pull_advance(comndr, payload_size));
+       payload = comndr->data + payload_offset;
+
+       comndr->data            = payload;
+       comndr->data_size       = payload_size;
+       comndr->offset          = 0;
+
        *_comndr = comndr;
        return NDR_ERR_SUCCESS;
 }