From 7ebd4337acfeeb69ffbf615a0220d0d338705849 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 24 Oct 2011 08:42:10 +0200 Subject: libcli/smb: move source3/libsmb/read_smb.* to the toplevel metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Mon Oct 24 10:18:06 CEST 2011 on sn-devel-104 --- libcli/smb/read_smb.c | 112 +++++++++++++++++++++++++++++++++++++++ libcli/smb/read_smb.h | 33 ++++++++++++ libcli/smb/wscript_build | 5 +- source3/Makefile.in | 3 +- source3/libsmb/async_smb.c | 2 +- source3/libsmb/cliconnect.c | 1 - source3/libsmb/read_smb.c | 110 -------------------------------------- source3/libsmb/read_smb.h | 33 ------------ source3/libsmb/smb2cli_base.c | 2 +- source3/libsmb/smbsock_connect.c | 2 +- source3/torture/torture.c | 2 +- source3/wscript_build | 5 +- 12 files changed, 157 insertions(+), 153 deletions(-) create mode 100644 libcli/smb/read_smb.c create mode 100644 libcli/smb/read_smb.h delete mode 100644 source3/libsmb/read_smb.c delete mode 100644 source3/libsmb/read_smb.h diff --git a/libcli/smb/read_smb.c b/libcli/smb/read_smb.c new file mode 100644 index 0000000000..26816c3be3 --- /dev/null +++ b/libcli/smb/read_smb.c @@ -0,0 +1,112 @@ +/* + Unix SMB/CIFS implementation. + Infrastructure for async SMB client requests + Copyright (C) Volker Lendecke 2008 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#include "includes.h" +#include "system/network.h" +#include "lib/async_req/async_sock.h" +#include "read_smb.h" +#include "lib/util/tevent_unix.h" +#include "libcli/smb/smb_constants.h" + +/* + * Read an smb packet asynchronously, discard keepalives + */ + +struct read_smb_state { + struct tevent_context *ev; + int fd; + uint8_t *buf; +}; + +static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data); +static void read_smb_done(struct tevent_req *subreq); + +struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + int fd) +{ + struct tevent_req *result, *subreq; + struct read_smb_state *state; + + result = tevent_req_create(mem_ctx, &state, struct read_smb_state); + if (result == NULL) { + return NULL; + } + state->ev = ev; + state->fd = fd; + + subreq = read_packet_send(state, ev, fd, 4, read_smb_more, NULL); + if (subreq == NULL) { + goto fail; + } + tevent_req_set_callback(subreq, read_smb_done, result); + return result; + fail: + TALLOC_FREE(result); + return NULL; +} + +static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data) +{ + if (buflen > 4) { + return 0; /* We've been here, we're done */ + } + return smb_len_tcp(buf); +} + +static void read_smb_done(struct tevent_req *subreq) +{ + struct tevent_req *req = tevent_req_callback_data( + subreq, struct tevent_req); + struct read_smb_state *state = tevent_req_data( + req, struct read_smb_state); + ssize_t len; + int err; + + len = read_packet_recv(subreq, state, &state->buf, &err); + TALLOC_FREE(subreq); + if (len == -1) { + tevent_req_error(req, err); + return; + } + + if (CVAL(state->buf, 0) == NBSSkeepalive) { + subreq = read_packet_send(state, state->ev, state->fd, 4, + read_smb_more, NULL); + if (tevent_req_nomem(subreq, req)) { + return; + } + tevent_req_set_callback(subreq, read_smb_done, req); + return; + } + tevent_req_done(req); +} + +ssize_t read_smb_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **pbuf, int *perrno) +{ + struct read_smb_state *state = tevent_req_data( + req, struct read_smb_state); + + if (tevent_req_is_unix_error(req, perrno)) { + return -1; + } + *pbuf = talloc_move(mem_ctx, &state->buf); + return talloc_get_size(*pbuf); +} diff --git a/libcli/smb/read_smb.h b/libcli/smb/read_smb.h new file mode 100644 index 0000000000..ae4dfdd63a --- /dev/null +++ b/libcli/smb/read_smb.h @@ -0,0 +1,33 @@ +/* + Unix SMB/CIFS implementation. + Infrastructure for async SMB client requests + Copyright (C) Volker Lendecke 2008 + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef __LIBSMB_READ_SMB_H +#define __LIBSMB_READ_SMB_H + +#include "lib/talloc/talloc.h" +#include "lib/tevent/tevent.h" + +struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx, + struct tevent_context *ev, + int fd); + +ssize_t read_smb_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, + uint8_t **pbuf, int *perrno); + +#endif diff --git a/libcli/smb/wscript_build b/libcli/smb/wscript_build index 63349586f4..9339b96044 100644 --- a/libcli/smb/wscript_build +++ b/libcli/smb/wscript_build @@ -2,13 +2,14 @@ bld.SAMBA_LIBRARY('cli_smb_common', - source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c', + source='smb_seal.c smb2_create_blob.c smb2_signing.c util.c read_smb.c', autoproto='smb_common_proto.h', - deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP', + deps='LIBCRYPTO errors gssapi gensec KRB5_WRAP LIBASYNC_REQ', public_deps='talloc samba-util', private_library=True, public_headers='''smb_common.h smb2_constants.h smb_constants.h smb_seal.h smb2_create_blob.h smb2_signing.h smb_util.h smb_unix_ext.h + read_smb.h ''', ) diff --git a/source3/Makefile.in b/source3/Makefile.in index 62aff34094..6f216c67b8 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -603,8 +603,9 @@ LIBSMB_OBJ = libsmb/clientgen.o libsmb/cliconnect.o libsmb/clifile.o \ libsmb/clistr.o libsmb/cliquota.o libsmb/clifsinfo.o libsmb/clidfs.o \ libsmb/clioplock.o libsmb/clirap2.o \ libsmb/async_smb.o \ - libsmb/read_smb.o libsmb/clisigning.o \ + libsmb/clisigning.o \ ../libcli/smb/smb_seal.o \ + ../libcli/smb/read_smb.o \ libsmb/smb2cli_base.o \ libsmb/smb2cli_negprot.o \ libsmb/smb2cli_session.o \ diff --git a/source3/libsmb/async_smb.c b/source3/libsmb/async_smb.c index 3786638a0d..283dec6a5a 100644 --- a/source3/libsmb/async_smb.c +++ b/source3/libsmb/async_smb.c @@ -25,7 +25,7 @@ #include "async_smb.h" #include "../libcli/smb/smb_seal.h" #include "libsmb/nmblib.h" -#include "read_smb.h" +#include "../libcli/smb/read_smb.h" static NTSTATUS cli_pull_raw_error(const uint8_t *buf) { diff --git a/source3/libsmb/cliconnect.c b/source3/libsmb/cliconnect.c index da47bc512c..391903bf3b 100644 --- a/source3/libsmb/cliconnect.c +++ b/source3/libsmb/cliconnect.c @@ -32,7 +32,6 @@ #include "../lib/util/tevent_ntstatus.h" #include "async_smb.h" #include "libsmb/nmblib.h" -#include "read_smb.h" #include "librpc/ndr/libndr.h" static const struct { diff --git a/source3/libsmb/read_smb.c b/source3/libsmb/read_smb.c deleted file mode 100644 index 9c3d8f1e73..0000000000 --- a/source3/libsmb/read_smb.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Infrastructure for async SMB client requests - Copyright (C) Volker Lendecke 2008 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#include "includes.h" -#include "lib/async_req/async_sock.h" -#include "read_smb.h" -#include "lib/util/tevent_unix.h" - -/* - * Read an smb packet asynchronously, discard keepalives - */ - -struct read_smb_state { - struct tevent_context *ev; - int fd; - uint8_t *buf; -}; - -static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data); -static void read_smb_done(struct tevent_req *subreq); - -struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - int fd) -{ - struct tevent_req *result, *subreq; - struct read_smb_state *state; - - result = tevent_req_create(mem_ctx, &state, struct read_smb_state); - if (result == NULL) { - return NULL; - } - state->ev = ev; - state->fd = fd; - - subreq = read_packet_send(state, ev, fd, 4, read_smb_more, NULL); - if (subreq == NULL) { - goto fail; - } - tevent_req_set_callback(subreq, read_smb_done, result); - return result; - fail: - TALLOC_FREE(result); - return NULL; -} - -static ssize_t read_smb_more(uint8_t *buf, size_t buflen, void *private_data) -{ - if (buflen > 4) { - return 0; /* We've been here, we're done */ - } - return smb_len_tcp(buf); -} - -static void read_smb_done(struct tevent_req *subreq) -{ - struct tevent_req *req = tevent_req_callback_data( - subreq, struct tevent_req); - struct read_smb_state *state = tevent_req_data( - req, struct read_smb_state); - ssize_t len; - int err; - - len = read_packet_recv(subreq, state, &state->buf, &err); - TALLOC_FREE(subreq); - if (len == -1) { - tevent_req_error(req, err); - return; - } - - if (CVAL(state->buf, 0) == NBSSkeepalive) { - subreq = read_packet_send(state, state->ev, state->fd, 4, - read_smb_more, NULL); - if (tevent_req_nomem(subreq, req)) { - return; - } - tevent_req_set_callback(subreq, read_smb_done, req); - return; - } - tevent_req_done(req); -} - -ssize_t read_smb_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, - uint8_t **pbuf, int *perrno) -{ - struct read_smb_state *state = tevent_req_data( - req, struct read_smb_state); - - if (tevent_req_is_unix_error(req, perrno)) { - return -1; - } - *pbuf = talloc_move(mem_ctx, &state->buf); - return talloc_get_size(*pbuf); -} diff --git a/source3/libsmb/read_smb.h b/source3/libsmb/read_smb.h deleted file mode 100644 index ae4dfdd63a..0000000000 --- a/source3/libsmb/read_smb.h +++ /dev/null @@ -1,33 +0,0 @@ -/* - Unix SMB/CIFS implementation. - Infrastructure for async SMB client requests - Copyright (C) Volker Lendecke 2008 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . -*/ - -#ifndef __LIBSMB_READ_SMB_H -#define __LIBSMB_READ_SMB_H - -#include "lib/talloc/talloc.h" -#include "lib/tevent/tevent.h" - -struct tevent_req *read_smb_send(TALLOC_CTX *mem_ctx, - struct tevent_context *ev, - int fd); - -ssize_t read_smb_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx, - uint8_t **pbuf, int *perrno); - -#endif diff --git a/source3/libsmb/smb2cli_base.c b/source3/libsmb/smb2cli_base.c index 52b7d0586a..3563af12ef 100644 --- a/source3/libsmb/smb2cli_base.c +++ b/source3/libsmb/smb2cli_base.c @@ -20,7 +20,7 @@ #include "includes.h" #include "client.h" -#include "read_smb.h" +#include "libcli/smb/read_smb.h" #include "smb2cli_base.h" #include "libsmb/proto.h" #include "lib/async_req/async_sock.h" diff --git a/source3/libsmb/smbsock_connect.c b/source3/libsmb/smbsock_connect.c index 1bb076eee6..1926445c10 100644 --- a/source3/libsmb/smbsock_connect.c +++ b/source3/libsmb/smbsock_connect.c @@ -23,7 +23,7 @@ #include "../lib/util/tevent_unix.h" #include "client.h" #include "async_smb.h" -#include "read_smb.h" +#include "../libcli/smb/read_smb.h" #include "libsmb/nmblib.h" struct cli_session_request_state { diff --git a/source3/torture/torture.c b/source3/torture/torture.c index d70065aef7..e42684dc01 100644 --- a/source3/torture/torture.c +++ b/source3/torture/torture.c @@ -39,7 +39,7 @@ #include "libsmb/nmblib.h" #include "../lib/util/tevent_ntstatus.h" #include "util_tdb.h" -#include "libsmb/read_smb.h" +#include "../libcli/smb/read_smb.h" extern char *optarg; extern int optind; diff --git a/source3/wscript_build b/source3/wscript_build index 1c43be3b20..26a1ea200f 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -127,7 +127,7 @@ LIBSMB_SRC = '''libsmb/clientgen.c libsmb/cliconnect.c libsmb/clifile.c libsmb/clistr.c libsmb/cliquota.c libsmb/clifsinfo.c libsmb/clidfs.c libsmb/clioplock.c libsmb/clirap2.c libsmb/async_smb.c - libsmb/read_smb.c libsmb/clisigning.c + libsmb/clisigning.c libsmb/smb2cli_base.c libsmb/smb2cli_negprot.c libsmb/smb2cli_session.c @@ -874,7 +874,8 @@ bld.SAMBA3_SUBSYSTEM('LIBAFS_SETTOKEN', bld.SAMBA3_LIBRARY('smbconf', source=LIB_SMBCONF_SRC, deps='''LIBSMBCONF smbregistry REG_SMBCONF talloc param - util_reg samba-util errors3 charset SAMBA_VERSION''', + util_reg samba-util errors3 charset SAMBA_VERSION + cli_smb_common''', public_headers='../lib/smbconf/smbconf.h', pc_files=[], vnum='0') -- cgit