The branch, master has been updated
via 92b7e3e s3:libsmb: make cli_session_request_send/recv() static
via 74adebe s3:libsmb: move cli_session_request*() to smbsock_connect.c
via ab0a1cc s3:libsmb: move cli_smb_oplock_break_waiter*() to
clioplock.c
via 1e43bac s3:libsmb: use cli_smb_req_set_mid() in
cli_smb_oplock_break_waiter_send()
via 9e0d975 s3:libsmb: let cli_smb_req_mid() return the mid set by
cli_smb_req_set_mid()
from 8bd7135 dnspython: Update to latest upstream snapshot.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 92b7e3ee58d4c37d81103fcdab79184a84b084dc
Author: Stefan Metzmacher <[email protected]>
Date: Sun Aug 28 16:55:57 2011 +0200
s3:libsmb: make cli_session_request_send/recv() static
metze
Autobuild-User: Stefan Metzmacher <[email protected]>
Autobuild-Date: Sun Aug 28 20:29:01 CEST 2011 on sn-devel-104
commit 74adebe8d98122fc93365886e857eb03570f52b2
Author: Stefan Metzmacher <[email protected]>
Date: Sun Aug 28 16:53:56 2011 +0200
s3:libsmb: move cli_session_request*() to smbsock_connect.c
metze
commit ab0a1cc5c6bb089a5eeba461533b50c0fae2b1a3
Author: Stefan Metzmacher <[email protected]>
Date: Sun Aug 28 17:16:11 2011 +0200
s3:libsmb: move cli_smb_oplock_break_waiter*() to clioplock.c
metze
commit 1e43bacd5e1a9e804ff2cd82fed75302cb630efd
Author: Stefan Metzmacher <[email protected]>
Date: Sun Aug 28 16:28:21 2011 +0200
s3:libsmb: use cli_smb_req_set_mid() in cli_smb_oplock_break_waiter_send()
metze
commit 9e0d975512f12d5b0e474b60a749d8be9f07791d
Author: Stefan Metzmacher <[email protected]>
Date: Sun Aug 28 16:30:58 2011 +0200
s3:libsmb: let cli_smb_req_mid() return the mid set by cli_smb_req_set_mid()
metze
-----------------------------------------------------------------------
Summary of changes:
source3/include/async_smb.h | 14 ---
source3/libsmb/async_smb.c | 213 +-------------------------------------
source3/libsmb/clioplock.c | 79 ++++++++++++++
source3/libsmb/proto.h | 7 ++
source3/libsmb/smbsock_connect.c | 129 +++++++++++++++++++++++
5 files changed, 220 insertions(+), 222 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h
index 49a8b9e..482c7eb 100644
--- a/source3/include/async_smb.h
+++ b/source3/include/async_smb.h
@@ -51,18 +51,4 @@ NTSTATUS cli_smb_recv(struct tevent_req *req,
uint8_t min_wct, uint8_t *pwct, uint16_t **pvwv,
uint32_t *pnum_bytes, uint8_t **pbytes);
-struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- struct cli_state *cli);
-NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
- uint16_t *pfnum,
- uint8_t *plevel);
-
-struct tevent_req *cli_session_request_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- int sock,
- const struct nmb_name *called,
- const struct nmb_name *calling);
-bool cli_session_request_recv(struct tevent_req *req, int *err, uint8_t *resp);
-
#endif
diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c
index 5f2a644..0910332 100644
--- a/source3/libsmb/async_smb.c
+++ b/source3/libsmb/async_smb.c
@@ -301,6 +301,11 @@ uint16_t cli_smb_req_mid(struct tevent_req *req)
{
struct cli_smb_state *state = tevent_req_data(
req, struct cli_smb_state);
+
+ if (state->mid != 0) {
+ return state->mid;
+ }
+
return SVAL(state->header, smb_mid);
}
@@ -1072,211 +1077,3 @@ bool cli_has_async_calls(struct cli_state *cli)
return ((tevent_queue_length(cli->conn.outgoing) != 0)
|| (talloc_array_length(cli->conn.pending) != 0));
}
-
-struct cli_smb_oplock_break_waiter_state {
- uint16_t fnum;
- uint8_t level;
-};
-
-static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq);
-
-struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
- struct event_context *ev,
- struct cli_state *cli)
-{
- struct tevent_req *req, *subreq;
- struct cli_smb_oplock_break_waiter_state *state;
- struct cli_smb_state *smb_state;
-
- req = tevent_req_create(mem_ctx, &state,
- struct cli_smb_oplock_break_waiter_state);
- if (req == NULL) {
- return NULL;
- }
-
- /*
- * Create a fake SMB request that we will never send out. This is only
- * used to be set into the pending queue with the right mid.
- */
- subreq = cli_smb_req_create(mem_ctx, ev, cli, 0, 0, 0, NULL, 0, NULL);
- if (tevent_req_nomem(subreq, req)) {
- return tevent_req_post(req, ev);
- }
- smb_state = tevent_req_data(subreq, struct cli_smb_state);
- SSVAL(smb_state->header, smb_mid, 0xffff);
-
- if (!cli_smb_req_set_pending(subreq)) {
- tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq, cli_smb_oplock_break_waiter_done, req);
- return req;
-}
-
-static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
- req, struct cli_smb_oplock_break_waiter_state);
- uint8_t wct;
- uint16_t *vwv;
- uint32_t num_bytes;
- uint8_t *bytes;
- uint8_t *inbuf;
- NTSTATUS status;
-
- status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv,
- &num_bytes, &bytes);
- TALLOC_FREE(subreq);
- if (!NT_STATUS_IS_OK(status)) {
- tevent_req_nterror(req, status);
- return;
- }
- state->fnum = SVAL(vwv+2, 0);
- state->level = CVAL(vwv+3, 1);
- tevent_req_done(req);
-}
-
-NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
- uint16_t *pfnum,
- uint8_t *plevel)
-{
- struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
- req, struct cli_smb_oplock_break_waiter_state);
- NTSTATUS status;
-
- if (tevent_req_is_nterror(req, &status)) {
- return status;
- }
- *pfnum = state->fnum;
- *plevel = state->level;
- return NT_STATUS_OK;
-}
-
-
-struct cli_session_request_state {
- struct tevent_context *ev;
- int sock;
- uint32 len_hdr;
- struct iovec iov[3];
- uint8_t nb_session_response;
-};
-
-static void cli_session_request_sent(struct tevent_req *subreq);
-static void cli_session_request_recvd(struct tevent_req *subreq);
-
-struct tevent_req *cli_session_request_send(TALLOC_CTX *mem_ctx,
- struct tevent_context *ev,
- int sock,
- const struct nmb_name *called,
- const struct nmb_name *calling)
-{
- struct tevent_req *req, *subreq;
- struct cli_session_request_state *state;
-
- req = tevent_req_create(mem_ctx, &state,
- struct cli_session_request_state);
- if (req == NULL) {
- return NULL;
- }
- state->ev = ev;
- state->sock = sock;
-
- state->iov[1].iov_base = name_mangle(
- state, called->name, called->name_type);
- if (tevent_req_nomem(state->iov[1].iov_base, req)) {
- return tevent_req_post(req, ev);
- }
- state->iov[1].iov_len = name_len(
- (unsigned char *)state->iov[1].iov_base,
- talloc_get_size(state->iov[1].iov_base));
-
- state->iov[2].iov_base = name_mangle(
- state, calling->name, calling->name_type);
- if (tevent_req_nomem(state->iov[2].iov_base, req)) {
- return tevent_req_post(req, ev);
- }
- state->iov[2].iov_len = name_len(
- (unsigned char *)state->iov[2].iov_base,
- talloc_get_size(state->iov[2].iov_base));
-
- _smb_setlen(((char *)&state->len_hdr),
- state->iov[1].iov_len + state->iov[2].iov_len);
- SCVAL((char *)&state->len_hdr, 0, 0x81);
-
- state->iov[0].iov_base = &state->len_hdr;
- state->iov[0].iov_len = sizeof(state->len_hdr);
-
- subreq = writev_send(state, ev, NULL, sock, true, state->iov, 3);
- if (tevent_req_nomem(subreq, req)) {
- return tevent_req_post(req, ev);
- }
- tevent_req_set_callback(subreq, cli_session_request_sent, req);
- return req;
-}
-
-static void cli_session_request_sent(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct cli_session_request_state *state = tevent_req_data(
- req, struct cli_session_request_state);
- ssize_t ret;
- int err;
-
- ret = writev_recv(subreq, &err);
- TALLOC_FREE(subreq);
- if (ret == -1) {
- tevent_req_error(req, err);
- return;
- }
- subreq = read_smb_send(state, state->ev, state->sock);
- if (tevent_req_nomem(subreq, req)) {
- return;
- }
- tevent_req_set_callback(subreq, cli_session_request_recvd, req);
-}
-
-static void cli_session_request_recvd(struct tevent_req *subreq)
-{
- struct tevent_req *req = tevent_req_callback_data(
- subreq, struct tevent_req);
- struct cli_session_request_state *state = tevent_req_data(
- req, struct cli_session_request_state);
- uint8_t *buf;
- ssize_t ret;
- int err;
-
- ret = read_smb_recv(subreq, talloc_tos(), &buf, &err);
- TALLOC_FREE(subreq);
-
- if (ret < 4) {
- ret = -1;
- err = EIO;
- }
- if (ret == -1) {
- tevent_req_error(req, err);
- return;
- }
- /*
- * In case of an error there is more information in the data
- * portion according to RFC1002. We're not subtle enough to
- * respond to the different error conditions, so drop the
- * error info here.
- */
- state->nb_session_response = CVAL(buf, 0);
- tevent_req_done(req);
-}
-
-bool cli_session_request_recv(struct tevent_req *req, int *err, uint8_t *resp)
-{
- struct cli_session_request_state *state = tevent_req_data(
- req, struct cli_session_request_state);
-
- if (tevent_req_is_unix_error(req, err)) {
- return false;
- }
- *resp = state->nb_session_response;
- return true;
-}
diff --git a/source3/libsmb/clioplock.c b/source3/libsmb/clioplock.c
index f164ed5..a708453 100644
--- a/source3/libsmb/clioplock.c
+++ b/source3/libsmb/clioplock.c
@@ -22,6 +22,85 @@
#include "async_smb.h"
#include "libsmb/libsmb.h"
+struct cli_smb_oplock_break_waiter_state {
+ uint16_t fnum;
+ uint8_t level;
+};
+
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq);
+
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli)
+{
+ struct tevent_req *req, *subreq;
+ struct cli_smb_oplock_break_waiter_state *state;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct cli_smb_oplock_break_waiter_state);
+ if (req == NULL) {
+ return NULL;
+ }
+
+ /*
+ * Create a fake SMB request that we will never send out. This is only
+ * used to be set into the pending queue with the right mid.
+ */
+ subreq = cli_smb_req_create(mem_ctx, ev, cli, 0, 0, 0, NULL, 0, NULL);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ cli_smb_req_set_mid(subreq, 0xffff);
+
+ if (!cli_smb_req_set_pending(subreq)) {
+ tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, cli_smb_oplock_break_waiter_done, req);
+ return req;
+}
+
+static void cli_smb_oplock_break_waiter_done(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+ req, struct cli_smb_oplock_break_waiter_state);
+ uint8_t wct;
+ uint16_t *vwv;
+ uint32_t num_bytes;
+ uint8_t *bytes;
+ uint8_t *inbuf;
+ NTSTATUS status;
+
+ status = cli_smb_recv(subreq, state, &inbuf, 8, &wct, &vwv,
+ &num_bytes, &bytes);
+ TALLOC_FREE(subreq);
+ if (!NT_STATUS_IS_OK(status)) {
+ tevent_req_nterror(req, status);
+ return;
+ }
+ state->fnum = SVAL(vwv+2, 0);
+ state->level = CVAL(vwv+3, 1);
+ tevent_req_done(req);
+}
+
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+ uint16_t *pfnum,
+ uint8_t *plevel)
+{
+ struct cli_smb_oplock_break_waiter_state *state = tevent_req_data(
+ req, struct cli_smb_oplock_break_waiter_state);
+ NTSTATUS status;
+
+ if (tevent_req_is_nterror(req, &status)) {
+ return status;
+ }
+ *pfnum = state->fnum;
+ *plevel = state->level;
+ return NT_STATUS_OK;
+}
+
/****************************************************************************
send an ack for an oplock break request
****************************************************************************/
diff --git a/source3/libsmb/proto.h b/source3/libsmb/proto.h
index 1c7be95..f932924 100644
--- a/source3/libsmb/proto.h
+++ b/source3/libsmb/proto.h
@@ -693,6 +693,13 @@ NTSTATUS cli_message(struct cli_state *cli, const char
*host,
/* The following definitions come from libsmb/clioplock.c */
+struct tevent_req *cli_smb_oplock_break_waiter_send(TALLOC_CTX *mem_ctx,
+ struct event_context *ev,
+ struct cli_state *cli);
+NTSTATUS cli_smb_oplock_break_waiter_recv(struct tevent_req *req,
+ uint16_t *pfnum,
+ uint8_t *plevel);
+
struct tevent_req *cli_oplock_ack_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct cli_state *cli,
diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c
index 3b6ccb4..1bb076e 100644
--- a/source3/libsmb/smbsock_connect.c
+++ b/source3/libsmb/smbsock_connect.c
@@ -18,11 +18,140 @@
*/
#include "includes.h"
+#include "../lib/async_req/async_sock.h"
#include "../lib/util/tevent_ntstatus.h"
+#include "../lib/util/tevent_unix.h"
#include "client.h"
#include "async_smb.h"
+#include "read_smb.h"
#include "libsmb/nmblib.h"
+struct cli_session_request_state {
+ struct tevent_context *ev;
+ int sock;
+ uint32 len_hdr;
+ struct iovec iov[3];
+ uint8_t nb_session_response;
+};
+
+static void cli_session_request_sent(struct tevent_req *subreq);
+static void cli_session_request_recvd(struct tevent_req *subreq);
+
+static struct tevent_req *cli_session_request_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ int sock,
+ const struct nmb_name *called,
+ const struct nmb_name *calling)
+{
+ struct tevent_req *req, *subreq;
+ struct cli_session_request_state *state;
+
+ req = tevent_req_create(mem_ctx, &state,
+ struct cli_session_request_state);
+ if (req == NULL) {
+ return NULL;
+ }
+ state->ev = ev;
+ state->sock = sock;
+
+ state->iov[1].iov_base = name_mangle(
+ state, called->name, called->name_type);
+ if (tevent_req_nomem(state->iov[1].iov_base, req)) {
+ return tevent_req_post(req, ev);
+ }
+ state->iov[1].iov_len = name_len(
+ (unsigned char *)state->iov[1].iov_base,
+ talloc_get_size(state->iov[1].iov_base));
+
+ state->iov[2].iov_base = name_mangle(
+ state, calling->name, calling->name_type);
+ if (tevent_req_nomem(state->iov[2].iov_base, req)) {
+ return tevent_req_post(req, ev);
+ }
+ state->iov[2].iov_len = name_len(
+ (unsigned char *)state->iov[2].iov_base,
+ talloc_get_size(state->iov[2].iov_base));
+
+ _smb_setlen(((char *)&state->len_hdr),
+ state->iov[1].iov_len + state->iov[2].iov_len);
+ SCVAL((char *)&state->len_hdr, 0, 0x81);
+
+ state->iov[0].iov_base = &state->len_hdr;
+ state->iov[0].iov_len = sizeof(state->len_hdr);
+
+ subreq = writev_send(state, ev, NULL, sock, true, state->iov, 3);
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
+ }
+ tevent_req_set_callback(subreq, cli_session_request_sent, req);
+ return req;
+}
+
+static void cli_session_request_sent(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct cli_session_request_state *state = tevent_req_data(
+ req, struct cli_session_request_state);
+ ssize_t ret;
+ int err;
+
+ ret = writev_recv(subreq, &err);
+ TALLOC_FREE(subreq);
+ if (ret == -1) {
+ tevent_req_error(req, err);
+ return;
+ }
+ subreq = read_smb_send(state, state->ev, state->sock);
+ if (tevent_req_nomem(subreq, req)) {
+ return;
+ }
+ tevent_req_set_callback(subreq, cli_session_request_recvd, req);
+}
+
+static void cli_session_request_recvd(struct tevent_req *subreq)
+{
+ struct tevent_req *req = tevent_req_callback_data(
+ subreq, struct tevent_req);
+ struct cli_session_request_state *state = tevent_req_data(
+ req, struct cli_session_request_state);
+ uint8_t *buf;
+ ssize_t ret;
+ int err;
+
+ ret = read_smb_recv(subreq, talloc_tos(), &buf, &err);
+ TALLOC_FREE(subreq);
+
+ if (ret < 4) {
+ ret = -1;
+ err = EIO;
+ }
+ if (ret == -1) {
+ tevent_req_error(req, err);
+ return;
+ }
+ /*
+ * In case of an error there is more information in the data
+ * portion according to RFC1002. We're not subtle enough to
+ * respond to the different error conditions, so drop the
+ * error info here.
+ */
+ state->nb_session_response = CVAL(buf, 0);
+ tevent_req_done(req);
+}
+
+static bool cli_session_request_recv(struct tevent_req *req, int *err, uint8_t
*resp)
+{
+ struct cli_session_request_state *state = tevent_req_data(
+ req, struct cli_session_request_state);
+
+ if (tevent_req_is_unix_error(req, err)) {
+ return false;
+ }
+ *resp = state->nb_session_response;
+ return true;
+}
--
Samba Shared Repository
