Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local

[samba.git] / source4 / script / build_smb_interfaces.pl

diff --git a/source4/script/build_smb_interfaces.pl b/source4/script/build_smb_interfaces.pl
index 511d03e0d7a83450bab09104077dfc463fbd4dcd..5fac94ca6e4ab12c9767a9082db16a7d7d3b0281 100755 (executable)
--- a/source4/script/build_smb_interfaces.pl
+++ b/source4/script/build_smb_interfaces.pl
@@ -65,6 +65,7 @@ open(FILE, ">libcli/gen_raw/ejs_${basename}.c");
 print FILE "/* EJS wrapper functions auto-generated by build_smb_interfaces.pl */\n\n";
 
 print FILE "#include \"includes.h\"\n";
+print FILE "#include \"scripting/ejs/smbcalls.h\"\n";
 print FILE "#include \"lib/appweb/ejs/ejs.h\"\n";
 print FILE "#include \"scripting/ejs/ejsrpc.h\"\n"; # TODO: remove this
 print FILE "\n";
@@ -77,7 +78,7 @@ sub transfer_element($$$) {
   $type = $elt->{TYPE};
   $type =~ s/_t$//;
 
-  print FILE "\tejs_${dir}_$type(ejs, v, \"$prefix.$elt->{NAME}\")\n";
+  print FILE "\tNDR_CHECK(ejs_${dir}_$type(ejs, v, \"$prefix.$elt->{NAME}\"));\n";
 }
 
 sub transfer_struct($$) {
@@ -108,45 +109,25 @@ foreach my $s (@newheader) {
 
     print FILE "NTSTATUS ejs_pull_$s->{TYPE_DEFINED}(struct ejs_rpc *ejs, struct MprVar *v, struct $s->{TYPE_DEFINED} *r)\n";
     print FILE "{\n";
-    print FILE "\treturn NT_STATUS_OK;\n";
+
+    transfer_struct("pull", $s);
+
+    print FILE "\n\treturn NT_STATUS_OK;\n";
     print FILE "}\n\n";
 
     print FILE "NTSTATUS ejs_push_$s->{TYPE_DEFINED}(struct ejs_rpc *ejs, struct MprVar *v, const struct $s->{TYPE_DEFINED} *r)\n";
     print FILE "{\n";
-    print FILE "\treturn NT_STATUS_OK;\n";
+
+    transfer_struct("push", $s);
+
+    print FILE "\n\treturn NT_STATUS_OK;\n";
     print FILE "}\n\n";
 
-    # Top level ejs function
+    # Function call
 
     print FILE "static int ejs_$s->{TYPE_DEFINED}(int eid, int argc, struct MprVar **argv)\n";
     print FILE "{\n";
-    print FILE "\tstruct $s->{TYPE_DEFINED} params;\n";
-    print FILE "\tstruct smbcli_tree *tree;\n";
-    print FILE "\tNTSTATUS status;\n\n";
-
-    print FILE "\tif (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {\n";
-    print FILE "\t\tejsSetErrorMsg(eid, \"invalid arguments\");\n";
-    print FILE "\t\treturn -1;\n";
-    print FILE "\t}\n\n";
-
-    print FILE "\tstatus = ejs_pull_$s->{TYPE_DEFINED}(ejs, io, ptr);\n";
-    print FILE "\tif (!NT_STATUS_IS_OK(status)) {\n";
-    print FILE "\t\treturn -1;\n";
-    print FILE "\t}\n\n";
-
-    my $fn = $s->{TYPE_DEFINED};
-    $fn =~ s/^smb_/smb_raw_/;
-
-    print FILE "\tresult = $fn(tree, &params);\n\n";
-
-    print FILE "\tstatus = ejs_push_$s->{TYPE_DEFINED}(ejs, io, ptr);\n\n";
-
-    print FILE "\tmpr_Return(eid, mprNTSTATUS(result));\n\n";
-    print FILE "\tif (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {\n";
-    print FILE "\t\treturn -1;\n";
-    print FILE "\t}\n\n";
-    print FILE "\treturn 0;\n";
-
+    print FILE "\treturn ejs_raw_call(eid, argc, argv, (ejs_pull_function_t)ejs_pull_$s->{TYPE_DEFINED}, (ejs_push_function_t)ejs_push_$s->{TYPE_DEFINED});\n";
     print FILE "}\n\n";
 
   } else {
@@ -157,73 +138,24 @@ foreach my $s (@newheader) {
 
       # Push/pull union arm
 
-      print FILE "NTSTATUS ejs_pull_$s->{TYPE_DEFINED}_$arm->{NAME}(struct ejs_rpc *ejs, struct MprVar *v, struct $s->{TYPE_DEFINED}_$arm->{NAME} *r)\n";
+      print FILE "NTSTATUS ejs_pull_$s->{TYPE_DEFINED}_$arm->{NAME}(struct ejs_rpc *ejs, struct MprVar *v, union $s->{TYPE_DEFINED} *r)\n";
       print FILE "{\n";
-      print FILE "\treturn NT_STATUS_OK;\n";
-      print FILE "}\n\n";
 
-      print FILE "NTSTATUS ejs_push_$s->{TYPE_DEFINED}_$arm->{NAME}(struct ejs_rpc *ejs, struct MprVar *v, const struct $s->{TYPE_DEFINED}_$arm->{NAME} *r)\n";
-      print FILE "{\n";
-      print FILE "\treturn NT_STATUS_OK;\n";
+      transfer_struct("pull", $arm);
+
+      print FILE "\n\treturn NT_STATUS_OK;\n";
       print FILE "}\n\n";
 
-      print FILE "static int ejs_$s->{TYPE_DEFINED}_$arm->{NAME}(int eid, int argc, struct MprVar **argv)\n";
+      print FILE "NTSTATUS ejs_push_$s->{TYPE_DEFINED}_$arm->{NAME}(struct ejs_rpc *ejs, struct MprVar *v, const union $s->{TYPE_DEFINED} *r)\n";
       print FILE "{\n";
-      print FILE "\tunion $s->{TYPE_DEFINED} params;\n";
-      print FILE "\tstruct smbcli_tree *tree;\n";
-      print FILE "\tNTSTATUS result;\n\n";
-
-      print FILE "\tif (argc != 1 || argv[0]->type != MPR_TYPE_OBJECT) {\n";
-      print FILE "\t\tejsSetErrorMsg(eid, \"invalid arguments\");\n";
-      print FILE "\t\treturn -1;\n";
-      print FILE "\t}\n\n";
-
-      print FILE "\tstatus = ejs_pull_$s->{TYPE_DEFINED}_$arm->{NAME}(ejs, io, ptr);\n";
-      print FILE "\tif (!NT_STATUS_IS_OK(status)) {\n";
-      print FILE "\t\treturn -1;\n";
-      print FILE "\t}\n\n";
 
-      my $fn = $s->{TYPE_DEFINED};
-      $fn =~ s/^smb_/smb_raw_/;
-
-      print FILE "\tresult = $fn(tree, &params);\n\n";
-
-      print FILE "\tstatus = ejs_push_$s->{TYPE_DEFINED}_$arm->{NAME}(ejs, io, ptr);\n\n";
-
-      print FILE "\tmpr_Return(eid, mprNTSTATUS(result));\n\n";
-      print FILE "\tif (NT_STATUS_EQUAL(status, NT_STATUS_INTERNAL_ERROR)) {\n";
-      print FILE "\t\treturn -1;\n";
-      print FILE "\t}\n\n";
-      print FILE "\treturn 0;\n";
+      transfer_struct("push", $arm);
 
+      print FILE "\n\treturn NT_STATUS_OK;\n";
       print FILE "}\n\n";
-    }
-  }
-}
-
-# Module initialisation
-
-print FILE "static int ejs_${basename}_init(int eid, int argc, struct MprVar **argv)\n";
-print FILE "{\n";
-print FILE "\tstruct MprVar *obj = mprInitObject(eid, \"${basename}\", argc, argv);\n\n";
 
-foreach my $s (@newheader) {
-  if ($s->{TYPE} eq "struct") {
-    print FILE "\tmprSetCFunction(obj, \"$s->{TYPE_DEFINED}\", ejs_$s->{TYPE_DEFINED});\n";
-  } else {
-    foreach my $arm (@{$s->{FIELDS}}) {
-      print FILE "\tmprSetCFunction(obj, \"$s->{TYPE_DEFINED}_$arm->{NAME}\", ejs_$s->{TYPE_DEFINED});\n";
     }
   }
 }
 
-print FILE "}\n\n";
-
-print FILE "NTSTATUS ejs_init_${basename}(void)\n";
-print FILE "{\n";
-print FILE "\treturn smbcalls_register_ejs(\"${basename}_init\", ejs_${basename}_init);\n";
-print FILE "}\n";
-
 close(FILE);
-
-exit;