From 74dbeba723c642bd207dad9d6881e8aa803b7509 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 4 Jan 2018 21:26:58 +0100 Subject: dnscli: Make a few functions static We might want to use the tcp flavor in the future in the forwarder for a single, persistent TCP connection. Then we can easily re-publish it. Signed-off-by: Volker Lendecke Reviewed-by: Andreas Schneider --- libcli/dns/dns.c | 36 ++++++++++++++++++------------------ libcli/dns/libdns.h | 38 -------------------------------------- 2 files changed, 18 insertions(+), 56 deletions(-) (limited to 'libcli') diff --git a/libcli/dns/dns.c b/libcli/dns/dns.c index 6404cb8aa40..c30de2d4add 100644 --- a/libcli/dns/dns.c +++ b/libcli/dns/dns.c @@ -45,11 +45,11 @@ struct dns_udp_request_state { static void dns_udp_request_get_reply(struct tevent_req *subreq); static void dns_udp_request_done(struct tevent_req *subreq); -struct tevent_req *dns_udp_request_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - const char *server_addr_string, - const uint8_t *query, - size_t query_len) +static struct tevent_req *dns_udp_request_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + const char *server_addr_string, + const uint8_t *query, + size_t query_len) { struct tevent_req *req, *subreq; struct dns_udp_request_state *state; @@ -158,10 +158,10 @@ static void dns_udp_request_done(struct tevent_req *subreq) tevent_req_done(req); } -int dns_udp_request_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - uint8_t **reply, - size_t *reply_len) +static int dns_udp_request_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + uint8_t **reply, + size_t *reply_len) { struct dns_udp_request_state *state = tevent_req_data(req, struct dns_udp_request_state); @@ -201,11 +201,11 @@ static int dns_tcp_request_next_vector(struct tstream_context *stream, size_t *_count); static void dns_tcp_request_received(struct tevent_req *subreq); -struct tevent_req *dns_tcp_request_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - const char *server_addr_string, - const uint8_t *query, - size_t query_len) +static struct tevent_req *dns_tcp_request_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + const char *server_addr_string, + const uint8_t *query, + size_t query_len) { struct tevent_req *req, *subreq; struct dns_tcp_request_state *state; @@ -377,10 +377,10 @@ static void dns_tcp_request_received(struct tevent_req *subreq) tevent_req_done(req); } -int dns_tcp_request_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - uint8_t **reply, - size_t *reply_len) +static int dns_tcp_request_recv(struct tevent_req *req, + TALLOC_CTX *mem_ctx, + uint8_t **reply, + size_t *reply_len) { struct dns_tcp_request_state *state = tevent_req_data( req, struct dns_tcp_request_state); diff --git a/libcli/dns/libdns.h b/libcli/dns/libdns.h index 1b7c404f6b7..15ca257c0b3 100644 --- a/libcli/dns/libdns.h +++ b/libcli/dns/libdns.h @@ -26,44 +26,6 @@ #include "lib/util/time.h" #include "librpc/gen_ndr/dns.h" -/** Send an dns request to a dns server using UDP - * - *@param mem_ctx talloc memory context to use - *@param ev tevent context to use - *@param server_address address of the server as a string - *@param query dns query to send - *@param query_len length of the query - *@return tevent_req with the active request or NULL on out-of-memory - */ -struct tevent_req *dns_udp_request_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - const char *server_address, - const uint8_t *query, - size_t query_len); - -/** Get the dns response from a dns server via UDP - * - *@param req tevent_req struct returned from dns_udp_request_send - *@param mem_ctx talloc memory context to use for the reply string - *@param reply buffer that will be allocated and filled with the dns reply - *@param reply_len length of the reply buffer - *@return 0/errno - */ -int dns_udp_request_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - uint8_t **reply, - size_t *reply_len); - -struct tevent_req *dns_tcp_request_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - const char *server_addr_string, - const uint8_t *query, - size_t query_len); -int dns_tcp_request_recv(struct tevent_req *req, - TALLOC_CTX *mem_ctx, - uint8_t **reply, - size_t *reply_len); - /* * DNS request with fallback to TCP on truncation */ -- cgit v1.2.1