/[rdesktop]/sourceforge.net/trunk/rdesktop/tcp.c
This is repository of my old source code which isn't updated any more. Go to git.rot13.org for current projects!
ViewVC logotype

Diff of /sourceforge.net/trunk/rdesktop/tcp.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 303 by matthewc, Thu Jan 30 11:57:10 2003 UTC revision 423 by matthewc, Tue Jun 17 08:44:32 2003 UTC
# Line 12  Line 12 
12     but WITHOUT ANY WARRANTY; without even the implied warranty of     but WITHOUT ANY WARRANTY; without even the implied warranty of
13     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14     GNU General Public License for more details.     GNU General Public License for more details.
15      
16     You should have received a copy of the GNU General Public License     You should have received a copy of the GNU General Public License
17     along with this program; if not, write to the Free Software     along with this program; if not, write to the Free Software
18     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Line 28  Line 28 
28  #include <errno.h>              /* errno */  #include <errno.h>              /* errno */
29  #include "rdesktop.h"  #include "rdesktop.h"
30    
31    #ifndef INADDR_NONE
32    #define INADDR_NONE ((unsigned long) -1)
33    #endif
34    
35  static int sock;  static int sock;
36  static struct stream in;  static struct stream in;
37  static struct stream out;  static struct stream out;
# Line 35  extern int tcp_port_rdp; Line 39  extern int tcp_port_rdp;
39    
40  /* Initialise TCP transport data packet */  /* Initialise TCP transport data packet */
41  STREAM  STREAM
42  tcp_init(int maxlen)  tcp_init(uint32 maxlen)
43  {  {
44          if (maxlen > out.size)          if (maxlen > out.size)
45          {          {
46                  out.data = xrealloc(out.data, maxlen);                  out.data = (uint8 *) xrealloc(out.data, maxlen);
47                  out.size = maxlen;                  out.size = maxlen;
48          }          }
49    
# Line 70  tcp_send(STREAM s) Line 74  tcp_send(STREAM s)
74    
75  /* Receive a message on the TCP layer */  /* Receive a message on the TCP layer */
76  STREAM  STREAM
77  tcp_recv(int length)  tcp_recv(STREAM s, uint32 length)
78  {  {
79            unsigned int new_length, end_offset, p_offset;
80          int rcvd = 0;          int rcvd = 0;
81    
82          if (length > in.size)          if (s == NULL)
83          {          {
84                  in.data = xrealloc(in.data, length);                  /* read into "new" stream */
85                  in.size = length;                  if (length > in.size)
86                    {
87                            in.data = (uint8 *) xrealloc(in.data, length);
88                            in.size = length;
89                    }
90                    in.end = in.p = in.data;
91                    s = &in;
92            }
93            else
94            {
95                    /* append to existing stream */
96                    new_length = (s->end - s->data) + length;
97                    if (new_length > s->size)
98                    {
99                            p_offset = s->p - s->data;
100                            end_offset = s->end - s->data;
101                            s->data = (uint8 *) xrealloc(s->data, new_length);
102                            s->size = new_length;
103                            s->p = s->data + p_offset;
104                            s->end = s->data + end_offset;
105                    }
106          }          }
   
         in.end = in.p = in.data;  
107    
108          while (length > 0)          while (length > 0)
109          {          {
# Line 88  tcp_recv(int length) Line 111  tcp_recv(int length)
111                          /* User quit */                          /* User quit */
112                          return NULL;                          return NULL;
113    
114                  rcvd = recv(sock, in.end, length, 0);                  rcvd = recv(sock, s->end, length, 0);
115                  if (rcvd == -1)                  if (rcvd <= 0)
116                  {                  {
117                          error("recv: %s\n", strerror(errno));                          error("recv: %s\n", strerror(errno));
118                          return NULL;                          return NULL;
119                  }                  }
120    
121                  in.end += rcvd;                  s->end += rcvd;
122                  length -= rcvd;                  length -= rcvd;
123          }          }
124    
125          return &in;          return s;
126  }  }
127    
128  /* Establish a connection on the TCP layer */  /* Establish a connection on the TCP layer */
# Line 108  tcp_connect(char *server) Line 131  tcp_connect(char *server)
131  {  {
132          struct hostent *nslookup;          struct hostent *nslookup;
133          struct sockaddr_in servaddr;          struct sockaddr_in servaddr;
134          int true = 1;          int true_value = 1;
135    
136          if ((nslookup = gethostbyname(server)) != NULL)          if ((nslookup = gethostbyname(server)) != NULL)
137          {          {
# Line 136  tcp_connect(char *server) Line 159  tcp_connect(char *server)
159                  return False;                  return False;
160          }          }
161    
162          setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *) &true, sizeof(true));          setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, (void *) &true_value, sizeof(true_value));
163    
164          in.size = 4096;          in.size = 4096;
165          in.data = xmalloc(in.size);          in.data = (uint8 *) xmalloc(in.size);
166    
167          out.size = 4096;          out.size = 4096;
168          out.data = xmalloc(out.size);          out.data = (uint8 *) xmalloc(out.size);
169    
170          return True;          return True;
171  }  }
Legend:
Removed from v.303  
changed lines
  Added in v.423
  ViewVC Help
Powered by ViewVC 1.1.26