Skip to content

Commit

Permalink
CIFS: Add transform header handling callbacks
Browse files Browse the repository at this point in the history
We need to recognize and parse transformed packets in demultiplex
thread to find a corresponsing mid and process it further.

Signed-off-by: Pavel Shilovsky <pshilov@microsoft.com>
  • Loading branch information
Pavel Shilovsky authored and Steve French committed Feb 1, 2017
1 parent 026e93d commit 9bb17e0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
3 changes: 3 additions & 0 deletions fs/cifs/cifsglob.h
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,9 @@ struct smb_version_operations {
struct smb_rqst *);
/* free transform request */
void (*free_transform_rq)(struct smb_rqst *);
int (*is_transform_hdr)(void *buf);
int (*receive_transform)(struct TCP_Server_Info *,
struct mid_q_entry **);
};

struct smb_version_values {
Expand Down
17 changes: 12 additions & 5 deletions fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -872,12 +872,19 @@ cifs_demultiplex_thread(void *p)
continue;
server->total_read += length;

mid_entry = server->ops->find_mid(server, buf);
if (server->ops->is_transform_hdr &&
server->ops->receive_transform &&
server->ops->is_transform_hdr(buf)) {
length = server->ops->receive_transform(server,
&mid_entry);
} else {
mid_entry = server->ops->find_mid(server, buf);

if (!mid_entry || !mid_entry->receive)
length = standard_receive3(server, mid_entry);
else
length = mid_entry->receive(server, mid_entry);
if (!mid_entry || !mid_entry->receive)
length = standard_receive3(server, mid_entry);
else
length = mid_entry->receive(server, mid_entry);
}

if (length < 0)
continue;
Expand Down

0 comments on commit 9bb17e0

Please sign in to comment.