diff options
| author | Tim Potter <tpot@samba.org> | 2001-10-20 23:34:40 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2001-10-20 23:34:40 +0000 |
| commit | 7cd889f566ebe352721943e53a055db5b817f12f (patch) | |
| tree | 1e58956a4364719e01a683a7bcf1b1c20b28c427 | |
| parent | 88b55f47b4914f7d390939e4394ec3edd42be91f (diff) | |
| download | samba-7cd889f566ebe352721943e53a055db5b817f12f.tar.gz samba-7cd889f566ebe352721943e53a055db5b817f12f.tar.xz samba-7cd889f566ebe352721943e53a055db5b817f12f.zip | |
Converted a bunch of 0x85 constants to SMBkeepalive.
(This used to be commit b16a15a13ed7d267c6366abaeeb3ccafa5776f5e)
| -rw-r--r-- | source3/include/smb.h | 1 | ||||
| -rw-r--r-- | source3/lib/util_sock.c | 8 | ||||
| -rw-r--r-- | source3/smbd/process.c | 4 | ||||
| -rw-r--r-- | source3/smbd/reply.c | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index 7cef5670bd..8fcbe60646 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -848,6 +848,7 @@ struct bitmap { #define SMBffirst 0x82 /* find first */ #define SMBfunique 0x83 /* find unique */ #define SMBfclose 0x84 /* find close */ +#define SMBkeepalive 0x85 /* keepalive */ #define SMBinvalid 0xFE /* invalid command */ /* Extended 2.0 protocol */ diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c index 5979cd8b5a..681bc3065d 100644 --- a/source3/lib/util_sock.c +++ b/source3/lib/util_sock.c @@ -396,7 +396,7 @@ BOOL send_keepalive(int client) { unsigned char buf[4]; - buf[0] = 0x85; + buf[0] = SMBkeepalive; buf[1] = buf[2] = buf[3] = 0; return(write_socket_data(client,(char *)buf,4) == 4); @@ -592,7 +592,7 @@ static ssize_t read_smb_length_return_keepalive(int fd,char *inbuf,unsigned int len = smb_len(inbuf); msg_type = CVAL(inbuf,0); - if (msg_type == 0x85) + if (msg_type == SMBkeepalive) DEBUG(5,("Got keepalive packet\n")); } @@ -620,7 +620,7 @@ ssize_t read_smb_length(int fd,char *inbuf,unsigned int timeout) return len; /* Ignore session keepalives. */ - if(CVAL(inbuf,0) != 0x85) + if(CVAL(inbuf,0) != SMBkeepalive) break; } @@ -702,7 +702,7 @@ BOOL client_receive_smb(int fd,char *buffer, unsigned int timeout) } /* Ignore session keepalive packets. */ - if(CVAL(buffer,0) != 0x85) + if(CVAL(buffer,0) != SMBkeepalive) break; } show_msg(buffer); diff --git a/source3/smbd/process.c b/source3/smbd/process.c index a0bfdbb2a2..cf01cd2cf5 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -254,7 +254,7 @@ BOOL receive_next_smb(char *inbuf, int bufsize, int timeout) do { ret = receive_message_or_smb(inbuf,bufsize,timeout); - got_keepalive = (ret && (CVAL(inbuf,0) == 0x85)); + got_keepalive = (ret && (CVAL(inbuf,0) == SMBkeepalive)); } while (ret && got_keepalive); return ret; @@ -867,7 +867,7 @@ void process_smb(char *inbuf, char *outbuf) if (msg_type == 0) show_msg(inbuf); - else if(msg_type == 0x85) + else if(msg_type == SMBkeepalive) return; /* Keepalive packet. */ nread = construct_reply(inbuf,outbuf,nread,max_send); diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index 845fabda92..852a2d867b 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -122,7 +122,7 @@ int reply_special(char *inbuf,char *outbuf) case 0x89: /* session keepalive request (some old clients produce this?) */ - CVAL(outbuf,0) = 0x85; + CVAL(outbuf,0) = SMBkeepalive; CVAL(outbuf,3) = 0; break; @@ -132,7 +132,7 @@ int reply_special(char *inbuf,char *outbuf) DEBUG(0,("Unexpected session response\n")); break; - case 0x85: /* session keepalive */ + case SMBkeepalive: /* session keepalive */ default: return(0); } |