r7186: add [relative_base] property, which is allowed on typedef's

(maybe we could add them to elements latter...)

with this property all relative pointers from inside the struct or union
are relative to the struct/union start

metze
(This used to be commit c0dd18326c058e3e218d43f48ecff418f4b0b51e)

2 files changed, 129 insertions, 53 deletions

diff --git a/source4/librpc/ndr/libndr.h b/source4/librpc/ndr/libndr.h
index e5d8b0e593..93cc67eaad 100644
--- a/source4/librpc/ndr/libndr.h
+++ b/source4/librpc/ndr/libndr.h
@@ -46,6 +46,9 @@ struct ndr_pull {
 	uint32_t data_size;
 	uint32_t offset;
 
+	uint32_t relative_base_offset;
+	struct ndr_token_list *relative_base_list;
+
 	struct ndr_token_list *relative_list;
 	struct ndr_token_list *array_size_list;
 	struct ndr_token_list *array_length_list;
@@ -69,6 +72,9 @@ struct ndr_push {
 	uint32_t alloc_size;
 	uint32_t offset;
 
+	uint32_t relative_base_offset;
+	struct ndr_token_list *relative_base_list;
+
 	struct ndr_token_list *switch_list;
 	struct ndr_token_list *relative_list;
 
diff --git a/source4/librpc/ndr/ndr.c b/source4/librpc/ndr/ndr.c
index 4137a997f0..b1fbaaeb31 100644
--- a/source4/librpc/ndr/ndr.c
+++ b/source4/librpc/ndr/ndr.c
@@ -563,59 +563,6 @@ uint32_t ndr_print_get_switch_value(struct ndr_print *ndr, const void *p)
 }
 
 /*
-  pull a relative object - stage1
-  called during SCALARS processing
-*/
-NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
-{
-	return ndr_token_store(ndr, &ndr->relative_list, p, rel_offset);
-}
-
-/*
-  pull a relative object - stage2
-  called during BUFFERS processing
-*/
-NTSTATUS ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p)
-{
-	uint32_t rel_offset;
-	NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &rel_offset));
-	return ndr_pull_set_offset(ndr, rel_offset);
-}
-
-/*
-  push a relative object - stage1
-  this is called during SCALARS processing
-*/
-NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
-{
-	if (p == NULL) {
-		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
-		return NT_STATUS_OK;
-	}
-	NDR_CHECK(ndr_push_align(ndr, 4));
-	NDR_CHECK(ndr_token_store(ndr, &ndr->relative_list, p, ndr->offset));
-	return ndr_push_uint32(ndr, NDR_SCALARS, 0xFFFFFFFF);
-}
-
-/*
-  push a relative object - stage2
-  this is called during buffers processing
-*/
-NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
-{
-	struct ndr_push_save save;
-	if (p == NULL) {
-		return NT_STATUS_OK;
-	}
-	NDR_CHECK(ndr_push_align(ndr, 4));
-	ndr_push_save(ndr, &save);
-	NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ndr->offset));
-	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset));
-	ndr_push_restore(ndr, &save);
-	return NT_STATUS_OK;
-}
-
-/*
   pull a struct from a blob using NDR
 */
 NTSTATUS ndr_pull_struct_blob(const DATA_BLOB *blob, TALLOC_CTX *mem_ctx, void *p,
@@ -765,3 +712,126 @@ size_t ndr_size_union(const void *p, int flags, uint32_t level, ndr_push_flags_f
 	talloc_free(ndr);
 	return ret;
 }
+
+/*
+  get the current base for relative pointers for the push
+*/
+uint32_t ndr_push_get_relative_base_offset(struct ndr_push *ndr)
+{
+	return ndr->relative_base_offset;
+}
+
+/*
+  restore the old base for relative pointers for the push
+*/
+void ndr_push_restore_relative_base_offset(struct ndr_push *ndr, uint32_t offset)
+{
+	ndr->relative_base_offset = offset;
+}
+
+/*
+  setup the current base for relative pointers for the push
+  called in the NDR_SCALAR stage
+*/
+NTSTATUS ndr_push_setup_relative_base_offset1(struct ndr_push *ndr, const void *p, uint32_t offset)
+{
+	ndr->relative_base_offset = offset;
+	return ndr_token_store(ndr, &ndr->relative_base_list, p, offset);
+}
+
+/*
+  setup the current base for relative pointers for the push
+  called in the NDR_BUFFERS stage
+*/
+NTSTATUS ndr_push_setup_relative_base_offset2(struct ndr_push *ndr, const void *p)
+{
+	return ndr_token_retrieve(&ndr->relative_base_list, p, &ndr->relative_base_offset);
+}
+
+/*
+  push a relative object - stage1
+  this is called during SCALARS processing
+*/
+NTSTATUS ndr_push_relative_ptr1(struct ndr_push *ndr, const void *p)
+{
+	if (p == NULL) {
+		NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, 0));
+		return NT_STATUS_OK;
+	}
+	NDR_CHECK(ndr_push_align(ndr, 4));
+	NDR_CHECK(ndr_token_store(ndr, &ndr->relative_list, p, ndr->offset));
+	return ndr_push_uint32(ndr, NDR_SCALARS, 0xFFFFFFFF);
+}
+
+/*
+  push a relative object - stage2
+  this is called during buffers processing
+*/
+NTSTATUS ndr_push_relative_ptr2(struct ndr_push *ndr, const void *p)
+{
+	struct ndr_push_save save;
+	if (p == NULL) {
+		return NT_STATUS_OK;
+	}
+	ndr_push_save(ndr, &save);
+	NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &ndr->offset));
+	NDR_CHECK(ndr_push_uint32(ndr, NDR_SCALARS, save.offset));
+	ndr_push_restore(ndr, &save);
+	return NT_STATUS_OK;
+}
+
+/*
+  get the current base for relative pointers for the pull
+*/
+uint32_t ndr_pull_get_relative_base_offset(struct ndr_pull *ndr)
+{
+	return ndr->relative_base_offset;
+}
+
+/*
+  restore the old base for relative pointers for the pull
+*/
+void ndr_pull_restore_relative_base_offset(struct ndr_pull *ndr, uint32_t offset)
+{
+	ndr->relative_base_offset = offset;
+}
+
+/*
+  setup the current base for relative pointers for the pull
+  called in the NDR_SCALAR stage
+*/
+NTSTATUS ndr_pull_setup_relative_base_offset1(struct ndr_pull *ndr, const void *p, uint32_t offset)
+{
+	ndr->relative_base_offset = offset;
+	return ndr_token_store(ndr, &ndr->relative_base_list, p, offset);
+}
+
+/*
+  setup the current base for relative pointers for the pull
+  called in the NDR_BUFFERS stage
+*/
+NTSTATUS ndr_pull_setup_relative_base_offset2(struct ndr_pull *ndr, const void *p)
+{
+	return ndr_token_retrieve(&ndr->relative_base_list, p, &ndr->relative_base_offset);
+}
+
+/*
+  pull a relative object - stage1
+  called during SCALARS processing
+*/
+NTSTATUS ndr_pull_relative_ptr1(struct ndr_pull *ndr, const void *p, uint32_t rel_offset)
+{
+	rel_offset += ndr->relative_base_offset;
+	return ndr_token_store(ndr, &ndr->relative_list, p, rel_offset);
+}
+
+/*
+  pull a relative object - stage2
+  called during BUFFERS processing
+*/
+NTSTATUS ndr_pull_relative_ptr2(struct ndr_pull *ndr, const void *p)
+{
+	uint32_t rel_offset;
+	NDR_CHECK(ndr_token_retrieve(&ndr->relative_list, p, &rel_offset));
+	return ndr_pull_set_offset(ndr, rel_offset);
+}