r18475: Start working on server code generator that uses libndr.

(This used to be commit aa1c550d371c5874668baf06be7168c85dc5d48b)

3 files changed, 133 insertions, 126 deletions

diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/Server.pm b/source4/pidl/lib/Parse/Pidl/Samba3/Server.pm
deleted file mode 100644
index 179ace7dbb..0000000000
--- a/source4/pidl/lib/Parse/Pidl/Samba3/Server.pm
+++ /dev/null
@@ -1,122 +0,0 @@
-###################################################
-# Samba3 NDR server generator for IDL structures
-# Copyright jelmer@samba.org 2005
-# released under the GNU GPL
-
-package Parse::Pidl::Samba3::Server;
-
-use strict;
-use Parse::Pidl::Typelist qw(hasType getType mapType);
-use Parse::Pidl::Util qw(has_property ParseExpr);
-use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
-
-my $res = "";
-my $tabs = "";
-
-sub indent() { $tabs.="\t"; }
-sub deindent() { $tabs = substr($tabs, 1); }
-sub pidl($) { $res .= $tabs.(shift)."\n"; }
-
-use vars qw($VERSION);
-$VERSION = '0.01';
-
-sub ParseFunction($$)
-{
-	my ($if,$fn) = @_;
-
-	pidl "/******************************************************************";
-	pidl " api_$fn->{NAME}";
-	pidl " *****************************************************************/";
-	pidl "";
-	pidl "static BOOL api_$fn->{NAME}(pipes_struct *p)";
-	pidl "{";
-	indent;
-	pidl uc("$if->{NAME}_q_$fn->{NAME}") . " q_u;";
-	pidl uc("$if->{NAME}_r_$fn->{NAME}") . " r_u;";
-	pidl "prs_struct *data = &p->in_data.data;";
-	pidl "prs_struct *rdata = &p->out_data.rdata;";
-	pidl "";
-	pidl "ZERO_STRUCT(q_u);";
-	pidl "ZERO_STRUCT(r_u);";
-	pidl "";
-	pidl "if (!$if->{NAME}_io_q_$fn->{NAME}(\"\", &q_u, data, 0))";
-	pidl "\treturn False;";
-	pidl "";
-	if ($fn->{RETURN_TYPE}) {
-		pidl "r_u.status = _$fn->{NAME}(p, &q_u, &r_u);";
-	} else {
-		pidl "_$fn->{NAME}(p, &q_u, &r_u);";
-	}
-	pidl "";
-	pidl "if (!$if->{NAME}_io_r_$fn->{NAME}(\"\", &r_u, rdata, 0))";
-	pidl "\treturn False;";
-	pidl "";
-	pidl "return True;";
-	deindent;
-	pidl "}";
-}
-
-sub ParseInterface($)
-{
-	my $if = shift;
-
-	ParseFunction($if, $_) foreach (@{$if->{FUNCTIONS}});
-	
-	pidl "";
-	pidl "/* Tables */";
-	pidl "static struct api_struct api_$if->{NAME}_cmds[] = ";
-	pidl "{";
-	indent;
-	foreach (@{$if->{FUNCTIONS}}) {
-		pidl "{\"" . uc($_->{NAME}) . "\", " . uc($_->{NAME}) . ", api_$_->{NAME}},";
-	}
-	deindent;
-	pidl "};";
-
-	pidl "";
-	
-	pidl "void $if->{NAME}_get_pipe_fns(struct api_struct **fns, int *n_fns)";
-	pidl "{";
-	indent;
-	pidl "*fns = api_$if->{NAME}_cmds;";
-	pidl "*n_fns = sizeof(api_$if->{NAME}_cmds) / sizeof(struct api_struct);";
-	deindent;
-	pidl "}";
-
-	pidl "";
-
-	pidl "NTSTATUS rpc_$if->{NAME}_init(void)";
-	pidl "{";
-	indent;
-	pidl "return rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, \"$if->{NAME}\", \"$if->{NAME}\", api_$if->{NAME}_cmds, sizeof(api_$if->{NAME}_cmds) / sizeof(struct api_struct));";
-	deindent;
-	pidl "}";
-}
-
-sub Parse($$)
-{
-	my($ndr,$filename) = @_;
-
-	$tabs = "";
-	$res = "";
-
-	pidl "/*";
-	pidl " * Unix SMB/CIFS implementation.";
-	pidl " * server auto-generated by pidl. DO NOT MODIFY!";
-	pidl " */";
-	pidl "";
-	pidl "#include \"includes.h\"";
-	pidl "#include \"nterr.h\"";
-	pidl "";
-	pidl "#undef DBGC_CLASS";
-	pidl "#define DBGC_CLASS DBGC_RPC";
-	pidl "";
-
-	foreach (@$ndr) {
-		ParseInterface($_) if ($_->{TYPE} eq "INTERFACE");
-	}
-
-	return $res;
-}
-
-1;
diff --git a/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm b/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
new file mode 100644
index 0000000000..327aea2f0e
--- /dev/null
+++ b/source4/pidl/lib/Parse/Pidl/Samba3/ServerNDR.pm
@@ -0,0 +1,110 @@
+###################################################
+# Samba3 server generator for IDL structures
+# on top of Samba4 style NDR functions
+# Copyright jelmer@samba.org 2005-2006
+# released under the GNU GPL
+
+package Parse::Pidl::Samba3::ServerNDR;
+
+use strict;
+use Parse::Pidl::Typelist qw(hasType getType mapType scalar_is_reference);
+use Parse::Pidl::Util qw(has_property ParseExpr is_constant);
+use Parse::Pidl::NDR qw(GetPrevLevel GetNextLevel ContainsDeferred);
+use Parse::Pidl::Samba4 qw(DeclLong);
+
+use vars qw($VERSION);
+$VERSION = '0.01';
+
+my $res;
+my $res_hdr;
+my $tabs = "";
+sub indent() { $tabs.="\t"; }
+sub deindent() { $tabs = substr($tabs, 1); }
+sub pidl($) { $res .= $tabs.(shift)."\n"; }
+sub pidl_hdr($) { $res_hdr .= (shift)."\n"; }
+sub fatal($$) { my ($e,$s) = @_; die("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
+sub warning($$) { my ($e,$s) = @_; warn("$e->{ORIGINAL}->{FILE}:$e->{ORIGINAL}->{LINE}: $s\n"); }
+sub fn_declare($) { my ($n) = @_; pidl $n; pidl_hdr "$n;"; }
+
+sub ParseFunction($$)
+{
+	my ($if,$fn) = @_;
+
+	pidl "static BOOL api_$fn->{NAME}(pipes_struct *p)";
+	pidl "{";
+	indent;
+
+	deindent;
+	pidl "}";
+	pidl "";
+}
+
+sub ParseInterface($)
+{
+	my $if = shift;
+
+	my $uif = uc($if->{NAME});
+
+	pidl_hdr "#ifndef __SRV_$uif\__";
+	pidl_hdr "#define __SRV_$uif\__";
+	ParseFunction($if, $_) foreach (@{$if->{FUNCTIONS}});
+
+	pidl "";
+	pidl "/* Tables */";
+	pidl "static struct api_struct api_$if->{NAME}_cmds[] = ";
+	pidl "{";
+	indent;
+
+	foreach (@{$if->{FUNCTIONS}}) {
+		pidl "{\"" . uc($_->{NAME}) . "\", DCERPC_" . uc($_->{NAME}) . ", api_$_->{NAME}},";
+	}
+
+	deindent;
+	pidl "};";
+
+	pidl "";
+
+	pidl_hdr "void $if->{NAME}_get_pipe_fns(struct api_struct **fns, int *n_fns);";
+	pidl "void $if->{NAME}_get_pipe_fns(struct api_struct **fns, int *n_fns)";
+	pidl "{";
+	indent;
+	pidl "*fns = api_$if->{NAME}_cmds;";
+	pidl "*n_fns = sizeof(api_$if->{NAME}_cmds) / sizeof(struct api_struct);";
+	deindent;
+	pidl "}";
+	pidl "";
+
+	pidl_hdr "NTSTATUS rpc_netdfs_init(void);";
+	pidl "NTSTATUS rpc_netdfs_init(void)";
+	pidl "{";
+	pidl "\treturn rpc_pipe_register_commands(SMB_RPC_INTERFACE_VERSION, \"$if->{NAME}\", \"$if->{NAME}\", api_$if->{NAME}_cmds, sizeof(api_$if->{NAME}_cmds) / sizeof(struct api_struct));";
+	pidl "}";
+
+	pidl_hdr "#endif /* __SRV_$uif\__ */";
+}
+
+sub Parse($$$)
+{
+	my($ndr,$header,$ndr_header) = @_;
+
+	$res = "";
+	$res_hdr = "";
+
+	pidl "/*";
+	pidl " * Unix SMB/CIFS implementation.";
+	pidl " * server auto-generated by pidl. DO NOT MODIFY!";
+	pidl " */";
+	pidl "";
+	pidl "#include \"includes.h\"";
+	pidl "#include \"$header\"";
+	pidl_hdr "#include \"$ndr_header\"";
+	pidl "";
+	
+	foreach (@$ndr) {
+		ParseInterface($_) if ($_->{TYPE} eq "INTERFACE");
+	}
+
+	return ($res, $res_hdr);
+}
+
+1;
diff --git a/source4/pidl/pidl b/source4/pidl/pidl
index e57bb2fcff..669ca270f8 100755
--- a/source4/pidl/pidl
+++ b/source4/pidl/pidl
@@ -17,7 +17,7 @@ pidl - An IDL compiler written in Perl
 
 pidl --help
 
-pidl [--outputdir[=OUTNAME]] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--swig[=OUTPUT]] [--uint-enums] [--ndr-parser[=OUTPUT]] [--client] [--server] [--dcom-proxy] [--com-header] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [<idlfile>.idl]...
+pidl [--outputdir[=OUTNAME]] [--parse-idl-tree] [--dump-idl-tree] [--dump-ndr-tree] [--header[=OUTPUT]] [--ejs[=OUTPUT]] [--swig[=OUTPUT]] [--uint-enums] [--ndr-parser[=OUTPUT]] [--client] [--server] [--dcom-proxy] [--com-header] [--warn-compat] [--quiet] [--verbose] [--template] [--ws-parser[=OUTPUT]] [--diff] [--dump-idl] [--tdr-parser[=OUTPUT]] [--samba3-ndr-client[=OUTPUT]] [--samba3-ndr-server[=OUTPUT]] [<idlfile>.idl]...
 
 =head1 DESCRIPTION
 
@@ -126,6 +126,12 @@ Generate client calls for Samba3, to be placed in rpc_client/. Instead of
 calling out to the code in Samba3's rpc_parse/, this will call out to 
 Samba4's NDR code instead.
 
+=item I<--samba3-ndr-server>
+
+Generate server calls for Samba3, to be placed in rpc_server/. Instead of 
+calling out to the code in Samba3's rpc_parse/, this will call out to 
+Samba4's NDR code instead.
+
 =back
 
 =head1 IDL SYNTAX
@@ -351,8 +357,8 @@ usesgetlasterror, vararg, vi_progid, wire_marshal.
 	# Generating a TDR parser and header
 	$ ./pidl --tdr-parser --header -- regf.idl
 
-	# Generating a Samba3 parser, client and server
-	$ ./pidl --samba3-ndr-client -- dfs.idl
+	# Generating a Samba3 client and server
+	$ ./pidl --samba3-ndr-client --samba3-ndr-server -- dfs.idl
 
 	# Generating a Samba4 NDR parser, client and server
 	$ ./pidl --ndr-parser --ndr-client --ndr-server -- samr.idl
@@ -446,6 +452,7 @@ my($opt_samba3_header);
 my($opt_samba3_parser);
 my($opt_samba3_server);
 my($opt_samba3_ndr_client);
+my($opt_samba3_ndr_server);
 my($opt_template) = 0;
 my($opt_client);
 my($opt_server);
@@ -501,6 +508,8 @@ Samba 4 output:
 Samba 3 output:
  --samba3-ndr-client[=OUTF] create client calls for Samba3 
                             using Samba4's NDR code [cli_BASENAME.c]
+ --samba3-ndr-server[=OUTF] create server call wrapper for Samba3 
+                            using Samba4's NDR code [srv_BASENAME.c]
 
 Wireshark parsers:
  --ws-parser[=OUTFILE]  create Wireshark parser and header
@@ -518,6 +527,7 @@ my $result = GetOptions (
 		'dump-ndr-tree:s' => \$opt_dump_ndr_tree,
 	    'uint-enums' => \$opt_uint_enums,
 		'samba3-ndr-client:s' => \$opt_samba3_ndr_client,
+		'samba3-ndr-server:s' => \$opt_samba3_ndr_server,
 		'header:s' => \$opt_header,
 	    'server:s' => \$opt_server,
 	    'tdr-parser:s' => \$opt_tdr_parser,
@@ -619,7 +629,8 @@ sub process_file($)
 	    defined($opt_ndr_parser) or defined($opt_ejs) or 
 		defined($opt_dump_ndr_tree) or defined($opt_samba3_header) or 
 	    defined($opt_samba3_parser) or defined($opt_samba3_server) or 
-		defined($opt_swig) or defined($opt_samba3_ndr_client)) {
+		defined($opt_swig) or defined($opt_samba3_ndr_client) or
+		defined($opt_samba3_ndr_server)) {
 		require Parse::Pidl::NDR;
 		$ndr = Parse::Pidl::NDR::Parse($pidl);
 	}
@@ -739,6 +750,14 @@ $dcom
 		FileSave($header, $h_code);
 	}
 
+	if (defined($opt_samba3_ndr_server)) {
+		my $server = ($opt_samba3_ndr_server or "$outputdir/srv_$basename.c");
+		my $header = $server; $header =~ s/\.c$/\.h/;
+		require Parse::Pidl::Samba3::ServerNDR;
+		my ($c_code,$h_code) = Parse::Pidl::Samba3::ServerNDR::Parse($ndr, $header, $h_filename);
+		FileSave($server, $c_code);
+		FileSave($header, $h_code);
+	}
 
 }