Update content.

Signed-off-by: Michael Adam <obnox@samba.org>

diff --git a/content.wiki b/content.wiki
index 39f8e785dbb15c17777f163f741efc07d9d0d9d0..898ca1521107c94a642ae6629b9660499bf39f84 100644 (file)
--- a/content.wiki
+++ b/content.wiki
@@ -310,7 +310,7 @@
 
 <[center]
 <[columns]
-[[[.7\textwidth]]]
+[[[.65\textwidth]]]
 
 # SMB 3.0 (Win8 / 2012):
 #* new crypto (sign/encrypt) [4.0]
@@ -326,12 +326,43 @@
 # SMB 3.1.1 (Win10 / 2014):
 #* negotiate contexts, preauth: [master] 
 
-[[[.3\textwidth]]]
-<<<durable-crop-colormod-1024,width=.9\textwidth>>>
+[[[.35\textwidth]]]
+%<<<durable-crop-colormod-1024,width=.9\textwidth>>>
+<<<smb-auto-crop1,width=\textwidth>>>
 [columns]>
 [center]>
 
 
+==== SMB 3.1 ====
+
+<[block]{implemented}
+* 3.1.1 dialect
+* negotiate contexts
+* preauthentication integrity
+* encryption improvements (choose cipher) \\ %
+AES-128-CCM --> AES-128-GCM
+[block]>
+
+<[block]{not implemented}
+* cluster dialect fencing
+* cluster client failover v2 (client)
+[block]>
+
+
+[frame]>
+
+<[sambabg]
+
+==== ====[plain]
+
+<[center]
+\Large
+'''Multi-Channel'''
+[center]>
+
+[frame]>
+[sambabg]>
+
 %%==== ====[plain]
 %%
 %%old
@@ -478,9 +509,47 @@ messaging rewrite using unix dgm sockets with sendmsg [DONE,4.2]
 # implement test case [WIP]
 
 
+==== @MSG\_SMBXSRV\_CONNECTION\_PASS@ ====
+
+<[block]{from smbXsrv.idl}
+<[code]
+typedef struct {
+    NTTIME                 initial_connect_time;
+    GUID                   client_guid;
+    hyper                  seq_low;
+    DATA_BLOB              negotiate_request;
+} smbXsrv_connection_pass0;
+[code]>
+[block]>
+
+==== Internal Structures (smbXsrv) ====
+
+
+<[block]{before}
+<[code]
+smbXsrv_session->smbXsrv_connection
+[code]>
+[block]>
+
+<[block]{after}
+<[code]
+smbXsrv_session->smbXsrv_client->smbXsrv_connections
+[code]>
+[block]>
+
 [frame]>
 
 <[sambabg]
+
+==== ====[plain]
+
+<[center]
+\Large
+shell breakout to browse code/diff
+[center]>
+
+
+
 ==== ====[plain]
 
 <[center]
@@ -492,7 +561,7 @@ Multi-Channel Demo
 
 <[center]
 \Large
-Outlook: SMB Direct
+'''Outlook: SMB Direct'''
 [center]>
 
 [frame]>
@@ -504,7 +573,7 @@ Outlook: SMB Direct
 * windows:
 ** requires multi-channel
 ** start with TCP, bind an RDMA channel
-** reads and writes use RDMB write/read
+** reads and writes use RDMA write/read
 ** protocol/metadata via send/receive
 
 * wireshark dissector: [DONE]