[BACK]Return to msg.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/msg.c between version 1.4 and 1.4.2.2

version 1.4, 2002/07/01 16:15:25 version 1.4.2.2, 2003/09/16 21:20:26
Line 31 
Line 31 
 #include "msg.h"  #include "msg.h"
   
 void  void
 msg_send(int fd, u_char type, Buffer *m)  ssh_msg_send(int fd, u_char type, Buffer *m)
 {  {
         u_char buf[5];          u_char buf[5];
         u_int mlen = buffer_len(m);          u_int mlen = buffer_len(m);
   
         debug3("msg_send: type %u", (unsigned int)type & 0xff);          debug3("ssh_msg_send: type %u", (unsigned int)type & 0xff);
   
         PUT_32BIT(buf, mlen + 1);          PUT_32BIT(buf, mlen + 1);
         buf[4] = type;          /* 1st byte of payload is mesg-type */          buf[4] = type;          /* 1st byte of payload is mesg-type */
         if (atomicio(write, fd, buf, sizeof(buf)) != sizeof(buf))          if (atomicio(vwrite, fd, buf, sizeof(buf)) != sizeof(buf))
                 fatal("msg_send: write");                  fatal("ssh_msg_send: write");
         if (atomicio(write, fd, buffer_ptr(m), mlen) != mlen)          if (atomicio(vwrite, fd, buffer_ptr(m), mlen) != mlen)
                 fatal("msg_send: write");                  fatal("ssh_msg_send: write");
 }  }
   
 int  int
 msg_recv(int fd, Buffer *m)  ssh_msg_recv(int fd, Buffer *m)
 {  {
         u_char buf[4];          u_char buf[4];
         ssize_t res;          ssize_t res;
         u_int msg_len;          u_int msg_len;
   
         debug3("msg_recv entering");          debug3("ssh_msg_recv entering");
   
         res = atomicio(read, fd, buf, sizeof(buf));          res = atomicio(read, fd, buf, sizeof(buf));
         if (res != sizeof(buf)) {          if (res != sizeof(buf)) {
                 if (res == 0)                  if (res == 0)
                         return -1;                          return -1;
                 fatal("msg_recv: read: header %ld", (long)res);                  fatal("ssh_msg_recv: read: header %ld", (long)res);
         }          }
         msg_len = GET_32BIT(buf);          msg_len = GET_32BIT(buf);
         if (msg_len > 256 * 1024)          if (msg_len > 256 * 1024)
                 fatal("msg_recv: read: bad msg_len %u", msg_len);                  fatal("ssh_msg_recv: read: bad msg_len %u", msg_len);
         buffer_clear(m);          buffer_clear(m);
         buffer_append_space(m, msg_len);          buffer_append_space(m, msg_len);
         res = atomicio(read, fd, buffer_ptr(m), msg_len);          res = atomicio(read, fd, buffer_ptr(m), msg_len);
         if (res != msg_len)          if (res != msg_len)
                 fatal("msg_recv: read: %ld != msg_len", (long)res);                  fatal("ssh_msg_recv: read: %ld != msg_len", (long)res);
         return 0;          return 0;
 }  }
Legend:
Removed from v.1.4  
changed lines
  Added in v.1.4.2.2