From: Stefan Metzmacher Date: Mon, 26 Apr 2010 11:39:36 +0000 (+0200) Subject: s4:rpc_server: remove 'socket_address' based functions X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=7bbaab8dffcfe55b5da099840ec200be4d098b69;p=metze%2Fsamba%2Fwip.git s4:rpc_server: remove 'socket_address' based functions metze --- diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c index c9474233cb8e..0b0e3f22b636 100644 --- a/source4/rpc_server/dcerpc_server.c +++ b/source4/rpc_server/dcerpc_server.c @@ -1111,25 +1111,6 @@ _PUBLIC_ NTSTATUS dcesrv_reply(struct dcesrv_call_state *call) return NT_STATUS_OK; } -_PUBLIC_ struct socket_address *dcesrv_connection_get_my_addr(struct dcesrv_connection *conn, TALLOC_CTX *mem_ctx) -{ - if (!conn->transport.get_my_addr) { - return NULL; - } - - return conn->transport.get_my_addr(conn, mem_ctx); -} - -_PUBLIC_ struct socket_address *dcesrv_connection_get_peer_addr(struct dcesrv_connection *conn, TALLOC_CTX *mem_ctx) -{ - if (!conn->transport.get_peer_addr) { - return NULL; - } - - return conn->transport.get_peer_addr(conn, mem_ctx); -} - - /* remove the call from the right list when freed */ diff --git a/source4/rpc_server/dcerpc_server.h b/source4/rpc_server/dcerpc_server.h index 7e82548395e1..bf93380274fc 100644 --- a/source4/rpc_server/dcerpc_server.h +++ b/source4/rpc_server/dcerpc_server.h @@ -218,8 +218,6 @@ struct dcesrv_connection { struct { void *private_data; void (*report_output_data)(struct dcesrv_connection *); - struct socket_address *(*get_my_addr)(struct dcesrv_connection *, TALLOC_CTX *mem_ctx); - struct socket_address *(*get_peer_addr)(struct dcesrv_connection *, TALLOC_CTX *mem_ctx); } transport; struct tstream_context *stream; diff --git a/source4/rpc_server/service_rpc.c b/source4/rpc_server/service_rpc.c index 0cc930ebc5f5..906b02dc9ec4 100644 --- a/source4/rpc_server/service_rpc.c +++ b/source4/rpc_server/service_rpc.c @@ -370,8 +370,6 @@ static void dcesrv_sock_accept(struct stream_connection *srv_conn) dcesrv_conn->transport.private_data = srv_conn; dcesrv_conn->transport.report_output_data = dcesrv_sock_report_output_data; - dcesrv_conn->transport.get_my_addr = dcesrv_sock_get_my_addr; - dcesrv_conn->transport.get_peer_addr = dcesrv_sock_get_peer_addr; TALLOC_FREE(srv_conn->event.fde);