libcli: Add smb2_lease marshalling

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/libcli/smb/smb2_lease.c b/libcli/smb/smb2_lease.c
new file mode 100644 (file)
index 0000000..10beaca
--- /dev/null
+++ b/libcli/smb/smb2_lease.c
@@ -0,0 +1,86 @@
+/*
+   Unix SMB/CIFS implementation.
+
+   SMB2 Lease context handling
+
+   Copyright (C) Stefan Metzmacher 2012
+   Copyright (C) Volker Lendecke 2013
+
+   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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "../libcli/smb/smb_common.h"
+
+ssize_t smb2_lease_pull(uint8_t *buf, size_t len, struct smb2_lease *lease)
+{
+       int version;
+
+       switch (len) {
+       case 32:
+               version = 1;
+               break;
+       case 52:
+               version = 2;
+               break;
+       default:
+               return -1;
+       }
+
+       memcpy(&lease->lease_key, buf, 16);
+       lease->lease_state = IVAL(buf, 16);
+       lease->lease_flags = IVAL(buf, 20);
+       lease->lease_duration = BVAL(buf, 24);
+
+       switch (version) {
+       case 1:
+               memcpy(&lease->parent_lease_key, buf+32, 16);
+               lease->lease_epoch = SVAL(buf, 48);
+               break;
+       case 2:
+               ZERO_STRUCT(lease->parent_lease_key);
+               lease->lease_epoch = 0;
+               break;
+       }
+
+       return len;
+}
+
+bool smb2_lease_push(const struct smb2_lease *lease, uint8_t *buf, size_t len)
+{
+       int version;
+
+       switch (len) {
+       case 32:
+               version = 1;
+               break;
+       case 52:
+               version = 2;
+               break;
+       default:
+               return false;
+       }
+
+       memcpy(&buf[0], &lease->lease_key, 16);
+       SIVAL(buf, 16, lease->lease_state);
+       SIVAL(buf, 20, lease->lease_flags);
+       SBVAL(buf, 24, lease->lease_duration);
+
+       if (version == 2) {
+               memcpy(&buf[32], &lease->parent_lease_key, 16);
+               SIVAL(buf, 48, lease->lease_epoch);
+       }
+
+       return true;
+}

diff --git a/libcli/smb/smb2_lease.h b/libcli/smb/smb2_lease.h
index 7fc598b25873ffa206fb916a45459fca44bba56f..fa8e7af841eea607af749171615cfa0543cbd068 100644 (file)
--- a/libcli/smb/smb2_lease.h
+++ b/libcli/smb/smb2_lease.h
@@ -40,4 +40,11 @@ struct smb2_lease {
        uint16_t lease_epoch;
 };
 
+/*
+ * Parse a smb2 lease create context. Return -1 on error, buffer.length on
+ * success. V1 and V2 differ only by length of buffer.length
+ */
+ssize_t smb2_lease_pull(uint8_t *buf, size_t len, struct smb2_lease *lease);
+bool smb2_lease_push(const struct smb2_lease *lease, uint8_t *buf, size_t len);
+
 #endif /* _LIBCLI_SMB_SMB2_LEASE_H_ */

diff --git a/libcli/smb/wscript b/libcli/smb/wscript
index 13cf894ca5b0b1c179d59c16fb9a8eb9294b9312..544c43edf2a60a02309fa8fd549ed099aa64f1e1 100755 (executable)
--- a/libcli/smb/wscript
+++ b/libcli/smb/wscript
@@ -18,6 +18,7 @@ def build(bld):
        source='''
                smb_signing.c smb_seal.c
                smb2_create_blob.c smb2_signing.c
+                smb2_lease.c
                util.c
                smbXcli_base.c
                smb1cli_trans.c