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";
my $prefix = shift;
my $elt = shift;
- print FILE "\tejs_${dir}_$elt->{TYPE}(ejs, v, \"$prefix.$elt->{NAME}\")\n";
+ $type = $elt->{TYPE};
+ $type =~ s/_t$//;
+
+ print FILE "\tNDR_CHECK(ejs_${dir}_$type(ejs, v, \"$prefix.$elt->{NAME}\"));\n";
}
sub transfer_struct($$) {
if ($s->{TYPE} eq "struct") {
- # Top level struct
+ # Push/pull top level struct
- print FILE "static int ejs_$s->{TYPE_DEFINED}(int eid, int argc, struct MprVar **argv)\n";
+ 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 "\tstruct $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";
transfer_struct("pull", $s);
- my $fn = $s->{TYPE_DEFINED};
- $fn =~ s/^smb_/smb_raw_/;
+ print FILE "\n\treturn NT_STATUS_OK;\n";
+ print FILE "}\n\n";
- print FILE "\n\tresult = $fn(tree, ¶ms);\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";
transfer_struct("push", $s);
- print FILE "\n\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 "\n\treturn NT_STATUS_OK;\n";
+ print FILE "}\n\n";
+
+ # Function call
+ print FILE "static int ejs_$s->{TYPE_DEFINED}(int eid, int argc, struct MprVar **argv)\n";
+ print FILE "{\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 {
foreach my $arm (@{$s->{FIELDS}}) {
- print FILE "static int ejs_$s->{TYPE_DEFINED}_$arm->{NAME}(int eid, int argc, struct MprVar **argv)\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";
+ # Push/pull union arm
- 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 "NTSTATUS ejs_pull_$s->{TYPE_DEFINED}_$arm->{NAME}(struct ejs_rpc *ejs, struct MprVar *v, union $s->{TYPE_DEFINED} *r)\n";
+ print FILE "{\n";
transfer_struct("pull", $arm);
- my $fn = $s->{TYPE_DEFINED};
- $fn =~ s/^smb_/smb_raw_/;
+ print FILE "\n\treturn NT_STATUS_OK;\n";
+ print FILE "}\n\n";
- print FILE "\n\tresult = $fn(tree, ¶ms);\n\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";
transfer_struct("push", $arm);
- print FILE "\n\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 "\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;