summaryrefslogtreecommitdiff
path: root/source4/torture/gentest.c
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-20 20:59:45 +0200
committerStefan Metzmacher <metze@samba.org>2011-11-24 19:02:33 +0100
commit300343d16c2d7f1f10bbd3c5e484131bf8fa5dfc (patch)
tree2c3ab0ed111f30b928b998b0eca9fefea71378b4 /source4/torture/gentest.c
parenta210d9fa05d46ef2ec0dcdbf13e1fd83c93b6219 (diff)
downloadsamba-300343d16c2d7f1f10bbd3c5e484131bf8fa5dfc.tar.gz
s4:libcli/smb2: implement on top of smbXcli_conn/req
metze
Diffstat (limited to 'source4/torture/gentest.c')
-rw-r--r--source4/torture/gentest.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/source4/torture/gentest.c b/source4/torture/gentest.c
index 9b6e7fc0fd5..c7e32de359b 100644
--- a/source4/torture/gentest.c
+++ b/source4/torture/gentest.c
@@ -38,6 +38,7 @@
#include "dynconfig/dynconfig.h"
#include "libcli/security/security.h"
#include "libcli/raw/raw_proto.h"
+#include "../libcli/smb/smbXcli_base.h"
#define NSERVERS 2
#define NINSTANCES 2
@@ -279,13 +280,21 @@ static bool connect_servers(struct tevent_context *ev,
static unsigned int time_skew(void)
{
unsigned int ret;
+ NTTIME nt0, nt1;
+
if (options.smb2) {
- ret = labs(servers[0].smb2_tree[0]->session->transport->negotiate.system_time -
- servers[1].smb2_tree[0]->session->transport->negotiate.system_time);
+ struct smbXcli_conn *c0, *c1;
+
+ c0 = servers[0].smb2_tree[0]->session->transport->conn;
+ c1 = servers[1].smb2_tree[0]->session->transport->conn;
+
+ nt0 = smbXcli_conn_server_system_time(c0);
+ nt1 = smbXcli_conn_server_system_time(c1);
} else {
- ret = labs(servers[0].smb_tree[0]->session->transport->negotiate.server_time -
- servers[1].smb_tree[0]->session->transport->negotiate.server_time);
+ nt0 = servers[0].smb_tree[0]->session->transport->negotiate.server_time;
+ nt1 = servers[1].smb_tree[0]->session->transport->negotiate.server_time;
}
+ ret = labs(nt0 - nt1);
return ret + 300;
}