diff options
author | Stefan Metzmacher <metze@samba.org> | 2011-09-15 14:02:49 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-11-24 19:02:30 +0100 |
commit | b958498c2add7623e4914c4a04def6e41f5285cc (patch) | |
tree | 15eaa7cfb909924504f351bccd349cca46a441e3 /libcli/smb | |
parent | 1a0ce02a238fb0384b0a05783a0e277613dd0cb0 (diff) | |
download | samba-b958498c2add7623e4914c4a04def6e41f5285cc.tar.gz samba-b958498c2add7623e4914c4a04def6e41f5285cc.tar.bz2 samba-b958498c2add7623e4914c4a04def6e41f5285cc.zip |
smbXcli: add helper functions to access the negotiated features
metze
Diffstat (limited to 'libcli/smb')
-rw-r--r-- | libcli/smb/smbXcli_base.c | 95 | ||||
-rw-r--r-- | libcli/smb/smbXcli_base.h | 18 |
2 files changed, 113 insertions, 0 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c index c2e628c342..9038681f39 100644 --- a/libcli/smb/smbXcli_base.c +++ b/libcli/smb/smbXcli_base.c @@ -78,6 +78,7 @@ struct smbXcli_conn { DATA_BLOB gss_blob; uint8_t challenge[8]; const char *workgroup; + const char *name; int time_zone; NTTIME system_time; } server; @@ -329,6 +330,75 @@ const char *smbXcli_conn_remote_name(struct smbXcli_conn *conn) return conn->remote_name; } +uint16_t smbXcli_conn_max_requests(struct smbXcli_conn *conn) +{ + if (conn->protocol >= PROTOCOL_SMB2_02) { + /* + * TODO... + */ + return 1; + } + + return conn->smb1.server.max_mux; +} + +NTTIME smbXcli_conn_server_system_time(struct smbXcli_conn *conn) +{ + if (conn->protocol >= PROTOCOL_SMB2_02) { + return conn->smb2.server.system_time; + } + + return conn->smb1.server.system_time; +} + +const DATA_BLOB *smbXcli_conn_server_gss_blob(struct smbXcli_conn *conn) +{ + if (conn->protocol >= PROTOCOL_SMB2_02) { + return &conn->smb2.server.gss_blob; + } + + return &conn->smb1.server.gss_blob; +} + +const struct GUID *smbXcli_conn_server_guid(struct smbXcli_conn *conn) +{ + if (conn->protocol >= PROTOCOL_SMB2_02) { + return &conn->smb2.server.guid; + } + + return &conn->smb1.server.guid; +} + +uint32_t smb1cli_conn_capabilities(struct smbXcli_conn *conn) +{ + return conn->smb1.capabilities; +} + +uint32_t smb1cli_conn_max_xmit(struct smbXcli_conn *conn) +{ + return conn->smb1.max_xmit; +} + +uint32_t smb1cli_conn_server_session_key(struct smbXcli_conn *conn) +{ + return conn->smb1.server.session_key; +} + +const uint8_t *smb1cli_conn_server_challenge(struct smbXcli_conn *conn) +{ + return conn->smb1.server.challenge; +} + +uint16_t smb1cli_conn_server_security_mode(struct smbXcli_conn *conn) +{ + return conn->smb1.server.security_mode; +} + +int smb1cli_conn_server_time_zone(struct smbXcli_conn *conn) +{ + return conn->smb1.server.time_zone; +} + bool smb1cli_conn_activate_signing(struct smbXcli_conn *conn, const DATA_BLOB user_session_key, const DATA_BLOB response) @@ -1858,6 +1928,31 @@ bool smbXcli_conn_has_async_calls(struct smbXcli_conn *conn) || (talloc_array_length(conn->pending) != 0)); } +uint32_t smb2cli_conn_server_capabilities(struct smbXcli_conn *conn) +{ + return conn->smb2.server.capabilities; +} + +uint16_t smb2cli_conn_server_security_mode(struct smbXcli_conn *conn) +{ + return conn->smb2.server.security_mode; +} + +uint32_t smb2cli_conn_max_trans_size(struct smbXcli_conn *conn) +{ + return conn->smb2.server.max_trans_size; +} + +uint32_t smb2cli_conn_max_read_size(struct smbXcli_conn *conn) +{ + return conn->smb2.server.max_read_size; +} + +uint32_t smb2cli_conn_max_write_size(struct smbXcli_conn *conn) +{ + return conn->smb2.server.max_write_size; +} + struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct smbXcli_conn *conn, diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h index 17c889c4e5..4593c0922e 100644 --- a/libcli/smb/smbXcli_base.h +++ b/libcli/smb/smbXcli_base.h @@ -43,9 +43,21 @@ const struct sockaddr_storage *smbXcli_conn_local_sockaddr(struct smbXcli_conn * const struct sockaddr_storage *smbXcli_conn_remote_sockaddr(struct smbXcli_conn *conn); const char *smbXcli_conn_remote_name(struct smbXcli_conn *conn); +uint16_t smbXcli_conn_max_requests(struct smbXcli_conn *conn); +NTTIME smbXcli_conn_server_system_time(struct smbXcli_conn *conn); +const DATA_BLOB *smbXcli_conn_server_gss_blob(struct smbXcli_conn *conn); +const struct GUID *smbXcli_conn_server_guid(struct smbXcli_conn *conn); + void smbXcli_req_unset_pending(struct tevent_req *req); bool smbXcli_req_set_pending(struct tevent_req *req); +uint32_t smb1cli_conn_capabilities(struct smbXcli_conn *conn); +uint32_t smb1cli_conn_max_xmit(struct smbXcli_conn *conn); +uint32_t smb1cli_conn_server_session_key(struct smbXcli_conn *conn); +const uint8_t *smb1cli_conn_server_challenge(struct smbXcli_conn *conn); +uint16_t smb1cli_conn_server_security_mode(struct smbXcli_conn *conn); +int smb1cli_conn_server_time_zone(struct smbXcli_conn *conn); + bool smb1cli_conn_activate_signing(struct smbXcli_conn *conn, const DATA_BLOB user_session_key, const DATA_BLOB response); @@ -117,6 +129,12 @@ NTSTATUS smb1cli_req_recv(struct tevent_req *req, const struct smb1cli_req_expected_response *expected, size_t num_expected); +uint32_t smb2cli_conn_server_capabilities(struct smbXcli_conn *conn); +uint16_t smb2cli_conn_server_security_mode(struct smbXcli_conn *conn); +uint32_t smb2cli_conn_max_trans_size(struct smbXcli_conn *conn); +uint32_t smb2cli_conn_max_read_size(struct smbXcli_conn *conn); +uint32_t smb2cli_conn_max_write_size(struct smbXcli_conn *conn); + struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx, struct tevent_context *ev, struct smbXcli_conn *conn, |