summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-12-28 14:49:22 +0100
committerVolker Lendecke <vl@samba.org>2009-01-04 16:42:40 +0100
commit8c1691d2139e49d6fb47a6d85400a1b7b91ffd67 (patch)
tree58cd5345251f0fd8413ec5eec06726f8c698cc06
parentd933362cb7fdd93fef860feeac1d86b180e29a59 (diff)
downloadsamba-8c1691d2139e49d6fb47a6d85400a1b7b91ffd67.tar.gz
samba-8c1691d2139e49d6fb47a6d85400a1b7b91ffd67.tar.bz2
samba-8c1691d2139e49d6fb47a6d85400a1b7b91ffd67.zip
Remove wb_trans_send/recv
-rw-r--r--source3/lib/wb_reqtrans.c143
-rw-r--r--source3/winbindd/winbindd_proto.h9
2 files changed, 0 insertions, 152 deletions
diff --git a/source3/lib/wb_reqtrans.c b/source3/lib/wb_reqtrans.c
index faf1666705..1f5f181aa1 100644
--- a/source3/lib/wb_reqtrans.c
+++ b/source3/lib/wb_reqtrans.c
@@ -540,146 +540,3 @@ NTSTATUS wb_resp_write_recv(struct async_req *req)
{
return async_req_simple_recv(req);
}
-
-struct wb_trans_state {
- struct event_context *ev;
- struct timed_event *te;
- int fd;
- struct winbindd_response *wb_resp;
- size_t reply_max_extra_data;
-};
-
-static void wb_trans_timeout(struct event_context *ev, struct timed_event *te,
- const struct timeval *now, void *priv);
-static void wb_trans_sent(struct async_req *req);
-static void wb_trans_received(struct async_req *req);
-
-struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- int fd,
- struct winbindd_request *wb_req,
- struct timeval timeout,
- size_t reply_max_extra_data)
-{
- struct async_req *result, *subreq;
- struct wb_trans_state *state;
-
- result = async_req_new(mem_ctx);
- if (result == NULL) {
- return NULL;
- }
-
- state = talloc(result, struct wb_trans_state);
- if (state == NULL) {
- goto nomem;
- }
- result->private_data = state;
-
- state->ev = ev;
- state->fd = fd;
- state->reply_max_extra_data = reply_max_extra_data;
-
- state->te = event_add_timed(
- ev, state,
- timeval_current_ofs(timeout.tv_sec, timeout.tv_usec),
- "wb_trans_timeout", wb_trans_timeout, result);
- if (state->te == NULL) {
- goto nomem;
- }
-
- subreq = wb_req_write_send(state, state->ev, state->fd, wb_req);
- if (subreq == NULL) {
- goto nomem;
- }
- subreq->async.fn = wb_trans_sent;
- subreq->async.priv = result;
-
- return result;
-
- nomem:
- TALLOC_FREE(result);
- return NULL;
-}
-
-static void wb_trans_timeout(struct event_context *ev, struct timed_event *te,
- const struct timeval *now, void *priv)
-{
- struct async_req *req = talloc_get_type_abort(
- priv, struct async_req);
- struct wb_trans_state *state = talloc_get_type_abort(
- req->private_data, struct wb_trans_state);
-
- TALLOC_FREE(state->te);
- async_req_error(req, NT_STATUS_IO_TIMEOUT);
-}
-
-static void wb_trans_sent(struct async_req *subreq)
-{
- struct async_req *req = talloc_get_type_abort(
- subreq->async.priv, struct async_req);
- struct wb_trans_state *state = talloc_get_type_abort(
- req->private_data, struct wb_trans_state);
- NTSTATUS status;
-
- status = wb_req_write_recv(subreq);
- TALLOC_FREE(subreq);
- if (!NT_STATUS_IS_OK(status)) {
- async_req_error(req, status);
- return;
- }
-
- subreq = wb_resp_read_send(state, state->ev, state->fd);
- if (async_req_nomem(subreq, req)) {
- return;
- }
-
- subreq->async.fn = wb_trans_received;
- subreq->async.priv = req;
-};
-
-static void wb_trans_received(struct async_req *subreq)
-{
- struct async_req *req = talloc_get_type_abort(
- subreq->async.priv, struct async_req);
- struct wb_trans_state *state = talloc_get_type_abort(
- req->private_data, struct wb_trans_state);
- NTSTATUS status;
-
- TALLOC_FREE(state->te);
-
- status = wb_resp_read_recv(subreq, state, &state->wb_resp);
- TALLOC_FREE(subreq);
- if (!NT_STATUS_IS_OK(status)) {
- async_req_error(req, status);
- return;
- }
-
- async_req_done(req);
-}
-
-NTSTATUS wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
- struct winbindd_response **presp)
-{
- struct wb_trans_state *state = talloc_get_type_abort(
- req->private_data, struct wb_trans_state);
- NTSTATUS status;
-
- if (async_req_is_error(req, &status)) {
- return status;
- }
- *presp = talloc_move(mem_ctx, &state->wb_resp);
- return NT_STATUS_OK;
-}
-
-struct wb_trans_queue_state {
- struct wb_trans_queue_state *prev, *next;
- struct wb_trans_queue *queue;
- struct winbindd_request *req;
-};
-
-struct wb_trans_queue {
- int fd;
- struct timeval timeout;
- size_t max_resp_extra_data;
- struct wb_trans_queue_state *queued_requests;
-};
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 92ce1f9850..3869ac5771 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -88,15 +88,6 @@ struct async_req *wb_resp_write_send(TALLOC_CTX *mem_ctx,
struct winbindd_response *wb_resp);
NTSTATUS wb_resp_write_recv(struct async_req *req);
-struct async_req *wb_trans_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- int fd,
- struct winbindd_request *wb_req,
- struct timeval timeout,
- size_t reply_max_extra_data);
-NTSTATUS wb_trans_recv(struct async_req *req, TALLOC_CTX *mem_ctx,
- struct winbindd_response **presp);
-
/* The following definitions come from winbindd/winbindd_ads.c */