r3043: Use binding strings for specifying endpoints. The property for

specifying a endpoint is now also 'endpoint' instead of 'endpoints'. The
default endpoint (if none is specified) is still "ncacn_np:[\\pipe\\ifacename]",
where ifacename is the name of the interface.

Examples:

[
  uuid(60a15ec5-4de8-11d7-a637-005056a20182),
  endpoint("ncacn_np:[\\pipe\\rpcecho]", "ncacn_ip_tcp:")
]
interface rpcecho
{
	void dummy();
}

dcerpc_binding is now converted to ep_description in the server, but I hope to
completely eliminate ep_description later on.

The eventual goal of all these changes is to make it easier to add
 transports as I'm going to add support for
 ncalrpc (local RPC over named pipes) and ncacn_unix_stream (Unix sockets).
(This used to be commit f3da7c8b443a29b0c656c687a277384ae1353792)

1 files changed, 7 insertions, 9 deletions

diff --git a/source4/build/pidl/parser.pm b/source4/build/pidl/parser.pm
index 7d7ee7a163..15dd1cd70e 100644
--- a/source4/build/pidl/parser.pm
+++ b/source4/build/pidl/parser.pm
@@ -1482,20 +1482,18 @@ sub FunctionTable($)
 	}
 	pidl "\t{ NULL, 0, NULL, NULL }\n};\n\n";
 
-	my $endpoints;
-
-	if (! defined $interface->{PROPERTIES}->{endpoints}) {
-		$interface->{PROPERTIES}->{endpoints} = $interface->{NAME};
+	# If no endpoint is set, default to the interface name as a named pipe
+	if (! defined $interface->{PROPERTIES}->{endpoint}) {
+		$interface->{PROPERTIES}->{endpoint} = "\"ncacn_np:[\\\\pipe\\\\" . $interface->{NAME} . "]\"";
 	}
 
-	my @e = split / /, $interface->{PROPERTIES}->{endpoints};
+	my @e = split / /, $interface->{PROPERTIES}->{endpoint};
 	my $endpoint_count = $#e + 1;
 
-	pidl "static const char * const $interface->{NAME}\_endpoint_strings[] = {\n\t";
-	for (my $i=0; $i < $#e; $i++) {
-		pidl "\"$e[$i]\", ";
+	pidl "static const char * const $interface->{NAME}\_endpoint_strings[] = {\n";
+	foreach my $ep (@e) {
+		pidl "\t$ep, \n";
 	}
-	pidl "\"$e[$#e]\"\n";
 	pidl "};\n\n";
 
 	pidl "static const struct dcerpc_endpoint_list $interface->{NAME}\_endpoints = {\n";