diff options
author | Christopher R. Hertel <crh@samba.org> | 2002-07-01 03:42:04 +0000 |
---|---|---|
committer | Christopher R. Hertel <crh@samba.org> | 2002-07-01 03:42:04 +0000 |
commit | cd2b1357066a712efcf87ac61922ef871118e8de (patch) | |
tree | b04e7138d1c146ed3141827fc74d029fec9a1ed8 | |
parent | 4eda1801493a79a27ad49e141e6adf8c8d4db85b (diff) | |
download | samba-cd2b1357066a712efcf87ac61922ef871118e8de.tar.gz samba-cd2b1357066a712efcf87ac61922ef871118e8de.tar.xz samba-cd2b1357066a712efcf87ac61922ef871118e8de.zip |
The 17-bit length field in the header contains the number of
bytes which follow the header, not the full packet size.
[Yes, the length field is either 17-bits, or (per the RFCs) it is a
16-bit length field preceeded by an 8-bit flags field of which only
the low-order bit may be used. If that bit is set, then add 65536 to
the 16-bit length field. (In other words, it's a 17-bit unsigned
length field.)
...unless, of course, the transport is native TCP [port 445] in which
case the length field *might* be 24-bits wide.]
Anyway, the change is a very minor one. We were including the four bytes
of the header in the length count and, as a result, sending four bytes of
garbage at the end of the SESSION REQUEST packet.
Small fix in function cli_session_request().
-rw-r--r-- | source/libsmb/cliconnect.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/libsmb/cliconnect.c b/source/libsmb/cliconnect.c index 50d9edf5b2d..f0b02b97b02 100644 --- a/source/libsmb/cliconnect.c +++ b/source/libsmb/cliconnect.c @@ -952,7 +952,14 @@ BOOL cli_session_request(struct cli_state *cli, name_mangle(cli->calling.name, p, cli->calling.name_type); len += name_len(p); - /* setup the packet length */ + /* setup the packet length + * Remove four bytes from the length count, since the length + * field in the NBT Session Service header counts the number + * of bytes which follow. The cli_send_smb() function knows + * about this and accounts for those four bytes. + * CRH. + */ + len -= 4; _smb_setlen(cli->outbuf,len); SCVAL(cli->outbuf,0,0x81); |