/[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 625 by n-ki, Thu Mar 4 08:14:00 2004 UTC revision 828 by stargo, Sun Mar 6 21:11:18 2005 UTC
# Line 1  Line 1 
1  /*  /*
2     rdesktop: A Remote Desktop Protocol client.     rdesktop: A Remote Desktop Protocol client.
3     Protocol services - TCP layer     Protocol services - TCP layer
4     Copyright (C) Matthew Chapman 1999-2002     Copyright (C) Matthew Chapman 1999-2005
5        
6     This program is free software; you can redistribute it and/or modify     This program is free software; you can redistribute it and/or modify
7     it under the terms of the GNU General Public License as published by     it under the terms of the GNU General Public License as published by
# Line 35  Line 35 
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;
38  extern int tcp_port_rdp;  int g_tcp_port_rdp = TCP_PORT_RDP;
39    
40  /* Initialise TCP transport data packet */  /* Initialise TCP transport data packet */
41  STREAM  STREAM
# Line 142  tcp_connect(char *server) Line 142  tcp_connect(char *server)
142          struct addrinfo hints, *res, *ressave;          struct addrinfo hints, *res, *ressave;
143          char tcp_port_rdp_s[10];          char tcp_port_rdp_s[10];
144    
145          snprintf(tcp_port_rdp_s, 10, "%d", tcp_port_rdp);          snprintf(tcp_port_rdp_s, 10, "%d", g_tcp_port_rdp);
146    
147          memset(&hints, 0, sizeof(struct addrinfo));          memset(&hints, 0, sizeof(struct addrinfo));
148          hints.ai_family = AF_UNSPEC;          hints.ai_family = AF_UNSPEC;
149          hints.ai_socktype = SOCK_STREAM;          hints.ai_socktype = SOCK_STREAM;
150    
151          n = getaddrinfo(server, tcp_port_rdp_s, &hints, &res);          if ((n = getaddrinfo(server, tcp_port_rdp_s, &hints, &res)))
   
         if (n < 0)  
152          {          {
153                  error("getaddrinfo: %s\n", gai_strerror(n));                  error("getaddrinfo: %s\n", gai_strerror(n));
154                  return False;                  return False;
# Line 200  tcp_connect(char *server) Line 198  tcp_connect(char *server)
198          }          }
199    
200          servaddr.sin_family = AF_INET;          servaddr.sin_family = AF_INET;
201          servaddr.sin_port = htons(tcp_port_rdp);          servaddr.sin_port = htons(g_tcp_port_rdp);
202    
203          if (connect(sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0)          if (connect(sock, (struct sockaddr *) &servaddr, sizeof(struct sockaddr)) < 0)
204          {          {
# Line 234  tcp_get_address() Line 232  tcp_get_address()
232  {  {
233          static char ipaddr[32];          static char ipaddr[32];
234          struct sockaddr_in sockaddr;          struct sockaddr_in sockaddr;
235          size_t len = sizeof(sockaddr);          socklen_t len = sizeof(sockaddr);
236          if (getsockname(sock, (struct sockaddr *) &sockaddr, &len) == 0)          if (getsockname(sock, (struct sockaddr *) &sockaddr, &len) == 0)
237          {          {
238                  unsigned char *ip = (unsigned char *) &sockaddr.sin_addr;                  unsigned char *ip = (unsigned char *) &sockaddr.sin_addr;
Legend:
Removed from v.625  
changed lines
  Added in v.828
  ViewVC Help
Powered by ViewVC 1.1.26