diff options
| author | Stefan Metzmacher <metze@samba.org> | 2005-10-10 12:14:29 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:39:38 -0500 |
| commit | 2f115473bfa058c509c206b6359b5c0d7e8e18c2 (patch) | |
| tree | 877309448b9647acbbb3d33b3f3534cf4b468c7d | |
| parent | 0e65d30bb72d4ad27c14c8467df115f4c1174d9a (diff) | |
| download | samba-2f115473bfa058c509c206b6359b5c0d7e8e18c2.tar.gz samba-2f115473bfa058c509c206b6359b5c0d7e8e18c2.tar.bz2 samba-2f115473bfa058c509c206b6359b5c0d7e8e18c2.zip | |
r10870: decompress DsGetNCChangesCtr7 replies, that uses type 2 (MSZIP)
compression
metze
(This used to be commit b451137526c4872a808f14ef42b2ed50abce1355)
| -rw-r--r-- | source4/librpc/idl/drsuapi.idl | 76 |
1 files changed, 57 insertions, 19 deletions
diff --git a/source4/librpc/idl/drsuapi.idl b/source4/librpc/idl/drsuapi.idl index 85254b3987..39aa4b9f55 100644 --- a/source4/librpc/idl/drsuapi.idl +++ b/source4/librpc/idl/drsuapi.idl @@ -598,22 +598,6 @@ interface drsuapi } drsuapi_DsGetNCChangesCtr1; typedef struct { - uint32 decompressed_length; - uint32 compressed_length; - [subcontext(4),subcontext_size(r->compressed_length),compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)] drsuapi_DsGetNCChangesCtr1 *ctr1; - } drsuapi_DsGetNCChangesCompressedInfo; - - typedef struct { - uint32 decompressed_length; - uint32 compressed_length; - [subcontext(4),subcontext_size(r->compressed_length),flag(NDR_REMAINING)] DATA_BLOB *decompressed; - } drsuapi_DsGetNCChangesCompressedInfo_Test; - - typedef struct { - drsuapi_DsGetNCChangesCompressedInfo info; - } drsuapi_DsGetNCChangesCtr2; - - typedef struct { drsuapi_DsReplicaObjectIdentifier *dn; drsuapi_DsAttributeId attid; /* this dn_string, depends on the attid, maybe could be another @@ -646,9 +630,63 @@ interface drsuapi } drsuapi_DsGetNCChangesCtr6; typedef struct { - uint32 unknown1; - uint16 unknown2; /* enum */ - drsuapi_DsGetNCChangesCompressedInfo_Test info; + uint32 decompressed_length; + uint32 compressed_length; + [subcontext(4),subcontext_size(r->compressed_length), + compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)] + drsuapi_DsGetNCChangesCtr1 *ctr1; + } drsuapi_DsGetNCChangesMSZIPCtr1; + + typedef struct { + uint32 decompressed_length; + uint32 compressed_length; + [subcontext(4),subcontext_size(r->compressed_length), + compression(NDR_COMPRESSION_MSZIP,compressed_length,decompressed_length)] + drsuapi_DsGetNCChangesCtr6 *ctr6; + } drsuapi_DsGetNCChangesMSZIPCtr6; + + typedef struct { + uint32 decompressed_length; + uint32 compressed_length; + [subcontext(4),subcontext_size(r->compressed_length), + compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length), + flag(NDR_REMAINING)] DATA_BLOB *decompressed; + } drsuapi_DsGetNCChangesXPRESSCtr1; + + typedef struct { + uint32 decompressed_length; + uint32 compressed_length; + [subcontext(4),subcontext_size(r->compressed_length), + compression(NDR_COMPRESSION_XPRESS,compressed_length,decompressed_length), + flag(NDR_REMAINING)] DATA_BLOB *decompressed; + } drsuapi_DsGetNCChangesXPRESSCtr6; + + typedef [enum16bit] enum { + DRSUAPI_COMPRESSION_TYPE_MSZIP = 2, + DRSUAPI_COMPRESSION_TYPE_XPRESS = 3 + } drsuapi_DsGetNCChangesCompressionType; + + typedef [nodiscriminant,flag(NDR_PAHEX)] union { + [case(1|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16))] drsuapi_DsGetNCChangesMSZIPCtr1 mszip1; + [case(6|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16))] drsuapi_DsGetNCChangesMSZIPCtr6 mszip6; + [case(1|(DRSUAPI_COMPRESSION_TYPE_XPRESS<<16))] drsuapi_DsGetNCChangesXPRESSCtr1 xpress1; + [case(6|(DRSUAPI_COMPRESSION_TYPE_XPRESS<<16))] drsuapi_DsGetNCChangesXPRESSCtr6 xpress6; + } drsuapi_DsGetNCChangesCompressedCtr; + + typedef struct { + /* + * this is a bit ugly, as the compression depends on the flags + * in the DsBind(), but only w2k uses DsGetNCChangesReq5 + * and will get DsGetNCChangesCtr2 replies, and w2k only knowns + * about MSZIP and level 1 replies + */ + [switch_is(1|(DRSUAPI_COMPRESSION_TYPE_MSZIP<<16))] drsuapi_DsGetNCChangesCompressedCtr ctr; + } drsuapi_DsGetNCChangesCtr2; + + typedef struct { + [range(0,6)] int32 level; + [range(2,3)] drsuapi_DsGetNCChangesCompressionType type; + [switch_is(level | (type<<16))] drsuapi_DsGetNCChangesCompressedCtr ctr; } drsuapi_DsGetNCChangesCtr7; typedef [switch_type(int32)] union { |