From: <as...@us...> - 2010-01-13 16:07:39
|
Revision: 1547 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1547&view=rev Author: astrand Date: 2010-01-13 16:07:29 +0000 (Wed, 13 Jan 2010) Log Message: ----------- Re-wrote top main loop. The patch for session directory / load balancing redirection made it *way* too complicated. We shouldn't really need two extra state variables in addition to g_redirect. The current approach also does not support future features such as automatic reconnection in case of network problems. The new loop should be functionally equivalent to the previous one, though it hasn't yet been tested with a load balancing server. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-13 14:53:43 UTC (rev 1546) +++ rdesktop/trunk/rdesktop.c 2010-01-13 16:07:29 UTC (rev 1547) @@ -455,8 +455,6 @@ char *locale = NULL; int username_option = 0; RD_BOOL geometry_option = False; - int run_count = 0; /* Session Directory support */ - RD_BOOL continue_connect = True; /* Session Directory support */ #ifdef WITH_RDPSND char *rdpsnd_optarg = NULL; #endif @@ -963,16 +961,23 @@ rdpdr_init(); - while (run_count < 2 && continue_connect) /* add support for Session Directory; only reconnect once */ + while (1) { - ui_init_connection(); + rdesktop_reset_state(); - if (run_count == 0) + if (g_redirect) { - if (!rdp_connect(server, flags, domain, password, shell, directory, False)) - return EX_PROTOCOL; + STRNCPY(domain, g_redirect_domain, sizeof(domain)); + xfree(g_username); + g_username = (char *) xmalloc(strlen(g_redirect_username) + 1); + STRNCPY(g_username, g_redirect_username, sizeof(g_username)); + STRNCPY(password, g_redirect_password, sizeof(password)); + STRNCPY(server, g_redirect_server, sizeof(server)); + flags |= RDP_LOGON_AUTO; } - else if (!rdp_connect(server, flags, domain, password, shell, directory, True)) + + ui_init_connection(); + if (!rdp_connect(server, flags, domain, password, shell, directory, g_redirect)) return EX_PROTOCOL; /* By setting encryption to False here, we have an encrypted login @@ -984,39 +989,20 @@ DEBUG(("Connection successful.\n")); memset(password, 0, sizeof(password)); - if (run_count == 0) + if (!g_redirect) if (!ui_create_window()) return EX_OSERR; - if (continue_connect) - rdp_main_loop(&deactivated, &ext_disc_reason); + g_redirect = False; + rdp_main_loop(&deactivated, &ext_disc_reason); DEBUG(("Disconnecting...\n")); rdp_disconnect(); - if ((g_redirect == True) && (run_count == 0)) /* Support for Session Directory */ - { - /* reset state of major globals */ - rdesktop_reset_state(); - - STRNCPY(domain, g_redirect_domain, sizeof(domain)); - xfree(g_username); - g_username = (char *) xmalloc(strlen(g_redirect_username) + 1); - STRNCPY(g_username, g_redirect_username, sizeof(g_username)); - STRNCPY(password, g_redirect_password, sizeof(password)); - STRNCPY(server, g_redirect_server, sizeof(server)); - flags |= RDP_LOGON_AUTO; - - g_redirect = False; - } - else - { - continue_connect = False; - ui_destroy_window(); - break; - } - - run_count++; + if (g_redirect) + continue; + ui_destroy_window(); + break; } cache_save_state(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-14 16:14:32
|
Revision: 1552 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1552&view=rev Author: astrand Date: 2010-01-14 16:14:23 +0000 (Thu, 14 Jan 2010) Log Message: ----------- Corrected last patch, which broke SeamlessRDP. We should update g_sizeopt to 100%; not g_width. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-14 15:53:24 UTC (rev 1551) +++ rdesktop/trunk/rdesktop.c 2010-01-14 16:14:23 UTC (rev 1552) @@ -867,7 +867,7 @@ error("You cannot use -4 and -A at the same time\n"); return EX_USAGE; } - g_width = -100; + g_sizeopt = -100; g_grab_keyboard = False; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-01-27 07:41:20
|
Revision: 1563 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1563&view=rev Author: astrand Date: 2010-01-27 07:41:14 +0000 (Wed, 27 Jan 2010) Log Message: ----------- Only call scard_reset_state() if building with scard support. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-01-27 07:40:47 UTC (rev 1562) +++ rdesktop/trunk/rdesktop.c 2010-01-27 07:41:14 UTC (rev 1563) @@ -351,7 +351,9 @@ rdesktop_reset_state(void) { rdp_reset_state(); +#ifdef WITH_SCARD scard_reset_state(); +#endif } static RD_BOOL This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2010-08-26 08:57:58
|
Revision: 1600 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1600&view=rev Author: astrand Date: 2010-08-26 08:57:52 +0000 (Thu, 26 Aug 2010) Log Message: ----------- Increase domain name length to 255 chars. Applied patch from bug 2883075. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2010-06-22 13:06:50 UTC (rev 1599) +++ rdesktop/trunk/rdesktop.c 2010-08-26 08:57:52 UTC (rev 1600) @@ -449,7 +449,7 @@ { char server[64]; char fullhostname[64]; - char domain[16]; + char domain[256]; char password[64]; char shell[256]; char directory[256]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-12 12:02:31
|
Revision: 1610 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1610&view=rev Author: astrand Date: 2011-04-12 12:02:25 +0000 (Tue, 12 Apr 2011) Log Message: ----------- Ignore SIGPIPE, since we are using popen when printing. Otherwise, the entire rdesktop application might exit just because lpr was quick to terminate. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2011-01-03 16:17:17 UTC (rev 1609) +++ rdesktop/trunk/rdesktop.c 2011-04-12 12:02:25 UTC (rev 1610) @@ -27,6 +27,7 @@ #include <sys/times.h> /* times */ #include <ctype.h> /* toupper */ #include <errno.h> +#include <signal.h> #include "rdesktop.h" #ifdef HAVE_LOCALE_H @@ -474,6 +475,15 @@ } #endif + + /* Ignore SIGPIPE, since we are using popen() */ + struct sigaction act; + memset(&act, 0, sizeof(act)); + act.sa_handler = SIG_IGN; + sigemptyset(&act.sa_mask); + act.sa_flags = 0; + sigaction(SIGPIPE, &act, NULL); + flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2011-04-18 07:30:38
|
Revision: 1622 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1622&view=rev Author: astrand Date: 2011-04-18 07:30:28 +0000 (Mon, 18 Apr 2011) Log Message: ----------- Update copyright year in usage string, add "et al.". Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2011-04-18 07:28:31 UTC (rev 1621) +++ rdesktop/trunk/rdesktop.c 2011-04-18 07:30:28 UTC (rev 1622) @@ -135,7 +135,8 @@ usage(char *program) { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); - fprintf(stderr, "Version " PACKAGE_VERSION ". Copyright (C) 1999-2008 Matthew Chapman.\n"); + fprintf(stderr, + "Version " PACKAGE_VERSION ". Copyright (C) 1999-2011 Matthew Chapman et al.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); fprintf(stderr, "Usage: %s [options] server[:port]\n", program); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2012-06-19 06:01:19
|
Revision: 1660 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1660&view=rev Author: hean01 Date: 2012-06-19 06:01:10 +0000 (Tue, 19 Jun 2012) Log Message: ----------- Fixes a bug were license filename differs from load/save license that was introduced with commit 1648 and made rdesktop to always request a license and never present the one stored. Also fixed a potential issue with hash string length that did not have room for an \0 after the hash stringify conversion. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2012-06-15 05:16:20 UTC (rev 1659) +++ rdesktop/trunk/rdesktop.c 2012-06-19 06:01:10 UTC (rev 1660) @@ -1567,7 +1567,7 @@ load_licence(unsigned char **data) { uint8 ho[20], hi[16]; - char *home, path[PATH_MAX], hash[40]; + char *home, path[PATH_MAX], hash[41]; struct stat st; int fd, length; @@ -1577,7 +1577,7 @@ snprintf((char *) hi, 16, g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); - sec_hash_to_string(hash, 40, ho, 22); + sec_hash_to_string(hash, 41, ho, 20); snprintf(path, PATH_MAX, "%s" RDESKTOP_LICENSE_STORE "/%s.cal", home, hash); path[sizeof(path) - 1] = '\0'; @@ -1608,7 +1608,7 @@ save_licence(unsigned char *data, int length) { uint8 ho[20], hi[16]; - char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[40]; + char *home, path[PATH_MAX], tmppath[PATH_MAX], hash[41]; int fd; home = getenv("HOME"); @@ -1625,7 +1625,7 @@ snprintf((char *) hi, 16, g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); - sec_hash_to_string(hash, 40, ho, 20); + sec_hash_to_string(hash, 41, ho, 20); /* write licence to {sha1}.cal.new, then atomically rename to {sha1}.cal */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2012-06-19 06:54:30
|
Revision: 1661 http://rdesktop.svn.sourceforge.net/rdesktop/?rev=1661&view=rev Author: hean01 Date: 2012-06-19 06:54:23 +0000 (Tue, 19 Jun 2012) Log Message: ----------- Use sizeof() to prevent mixups for previous commit. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2012-06-19 06:01:10 UTC (rev 1660) +++ rdesktop/trunk/rdesktop.c 2012-06-19 06:54:23 UTC (rev 1661) @@ -1577,7 +1577,7 @@ snprintf((char *) hi, 16, g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); - sec_hash_to_string(hash, 41, ho, 20); + sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); snprintf(path, PATH_MAX, "%s" RDESKTOP_LICENSE_STORE "/%s.cal", home, hash); path[sizeof(path) - 1] = '\0'; @@ -1625,7 +1625,7 @@ snprintf((char *) hi, 16, g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); - sec_hash_to_string(hash, 41, ho, 20); + sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); /* write licence to {sha1}.cal.new, then atomically rename to {sha1}.cal */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-01-21 13:33:44
|
Revision: 1690 http://sourceforge.net/p/rdesktop/code/1690 Author: hean01 Date: 2013-01-21 13:33:41 +0000 (Mon, 21 Jan 2013) Log Message: ----------- Missed to add 't' to getopt() arguments in previous commit r1689. Revision Links: -------------- http://sourceforge.net/p/rdesktop/code/1689 Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-01-21 12:28:14 UTC (rev 1689) +++ rdesktop/trunk/rdesktop.c 2013-01-21 13:33:41 UTC (rev 1690) @@ -514,7 +514,7 @@ #endif while ((c = getopt(argc, argv, - VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEimzCDKS:T:NX:a:x:Pr:045h?")) != -1) + VNCOPT "Au:L:d:s:c:p:n:k:g:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1) { switch (c) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-03-22 12:38:23
|
Revision: 1703 http://sourceforge.net/p/rdesktop/code/1703 Author: hean01 Date: 2013-03-22 12:38:19 +0000 (Fri, 22 Mar 2013) Log Message: ----------- Add missing format string to snprintf's. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-03-22 10:20:11 UTC (rev 1702) +++ rdesktop/trunk/rdesktop.c 2013-03-22 12:38:19 UTC (rev 1703) @@ -1559,7 +1559,7 @@ if (home == NULL) return -1; - snprintf((char *) hi, 16, g_hostname); + snprintf((char *) hi, 16, "%s", g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); @@ -1607,7 +1607,7 @@ return; } - snprintf((char *) hi, 16, g_hostname); + snprintf((char *) hi, 16, "%s", g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-03-25 15:56:36
|
Revision: 1706 http://sourceforge.net/p/rdesktop/code/1706 Author: hean01 Date: 2013-03-25 15:56:32 +0000 (Mon, 25 Mar 2013) Log Message: ----------- Remove the use of getopt_long() introduced in previous commit. Replace it with normal getopt() as we had before to prevent breaking build of rdesktop on other platforms like solaris. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-03-25 13:01:38 UTC (rev 1705) +++ rdesktop/trunk/rdesktop.c 2013-03-25 15:56:32 UTC (rev 1706) @@ -21,7 +21,6 @@ #include <stdarg.h> /* va_list va_start va_end */ #include <unistd.h> /* read close getuid getgid getpid getppid gethostname */ -#include <getopt.h> #include <fcntl.h> /* open */ #include <pwd.h> /* getpwuid */ #include <termios.h> /* tcgetattr tcsetattr */ @@ -132,27 +131,11 @@ char g_codepage[16] = ""; #endif - - - char *g_sc_csp_name = NULL; /* Smartcard CSP name */ char *g_sc_reader_name = NULL; char *g_sc_card_name = NULL; char *g_sc_container_name = NULL; -#define OPT_BASE 256 -#define OPT_SC_CSP_NAME (OPT_BASE+1) -#define OPT_SC_READER_NAME (OPT_BASE+2) -#define OPT_SC_CARD_NAME (OPT_BASE+3) -#define OPT_SC_CONTAINER_NAME (OPT_BASE+4) -struct option longopts[] = { - {"sc-csp-name", 1, 0, OPT_SC_CSP_NAME}, - {"sc-reader-name", 1, 0, OPT_SC_READER_NAME}, - {"sc-card-name", 1, 0, OPT_SC_CARD_NAME}, - {"sc-container-name", 1, 0, OPT_SC_CONTAINER_NAME}, - {NULL} -}; - extern RDPDR_DEVICE g_rdpdr_device[]; extern uint32 g_num_devices; extern char *g_rdpdr_clientname; @@ -259,12 +242,12 @@ fprintf(stderr, " -4: use RDP version 4\n"); fprintf(stderr, " -5: use RDP version 5 (default)\n"); #ifdef WITH_SCARD - fprintf(stderr, "\nCredSSP Smartcard hinting\n"); - fprintf(stderr, " --sc-csp-name Specifies the Crypto Service Provider name which\n"); - fprintf(stderr, " is used to authenticate the user by smartcard\n"); - fprintf(stderr, " --sc-container-name Specifies the container name, this is usally the username\n"); - fprintf(stderr, " --sc-reader-name Smartcard reader name to use\n"); - fprintf(stderr, " --sc-card-name Specifies the card name of the smartcard to use\n"); + fprintf(stderr, " -o: name=value: Adds an additional option to rdesktop.\n"); + fprintf(stderr, " sc-csp-name Specifies the Crypto Service Provider name which\n"); + fprintf(stderr, " is used to authenticate the user by smartcard\n"); + fprintf(stderr, " sc-container-name Specifies the container name, this is usally the username\n"); + fprintf(stderr, " sc-reader-name Smartcard reader name to use\n"); + fprintf(stderr, " sc-card-name Specifies the card name of the smartcard to use\n"); #endif fprintf(stderr, "\n"); @@ -549,8 +532,8 @@ #else #define VNCOPT #endif - while ((c = getopt_long(argc, argv, - VNCOPT "A:u:L:d:s:c:p:n:k:g:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?", longopts, &longidx)) != -1) + while ((c = getopt(argc, argv, + VNCOPT "A:u:L:d:s:c:p:n:k:g:o:fbBeEitmzCDKS:T:NX:a:x:Pr:045h?")) != -1) { switch (c) { @@ -896,21 +879,24 @@ g_rdp_version = RDP_V5; break; #if WITH_SCARD - case OPT_SC_CSP_NAME: - g_sc_csp_name = strdup(optarg); - break; + case 'o': + { + char *p = strchr(optarg, '='); + if (p == NULL) { + warning("Skipping option '%s' specified, lacks name=value format.\n"); + continue; + } - case OPT_SC_READER_NAME: - g_sc_reader_name = strdup(optarg); - break; - - case OPT_SC_CARD_NAME: - g_sc_card_name = strdup(optarg); - break; - - case OPT_SC_CONTAINER_NAME: - g_sc_container_name = strdup(optarg); - break; + if (strncmp(optarg, "sc-csp-name", strlen("sc-scp-name")) == 0) + g_sc_csp_name = strdup(p+1); + else if (strncmp(optarg, "sc-reader-name", strlen("sc-reader-name")) == 0) + g_sc_reader_name = strdup(p+1); + else if (strncmp(optarg, "sc-card-name", strlen("sc-card-name")) == 0) + g_sc_card_name = strdup(p+1); + else if (strncmp(optarg, "sc-container-name", strlen("sc-container-name")) == 0) + g_sc_container_name = strdup(p+1); + + } break; #endif case 'h': case '?': This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-06-13 12:32:32
|
Revision: 1712 http://sourceforge.net/p/rdesktop/code/1712 Author: hean01 Date: 2013-06-13 12:32:29 +0000 (Thu, 13 Jun 2013) Log Message: ----------- Do not report each reconnection retry every 4 seconds, just log that we entered reconnction loop and log errors. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-06-13 11:01:55 UTC (rev 1711) +++ rdesktop/trunk/rdesktop.c 2013-06-13 12:32:29 UTC (rev 1712) @@ -50,6 +50,8 @@ #include "ssl.h" +/* Reconnect timeout based on approxiamted cookie life-time */ +#define RECONNECT_TIMEOUT (3600+600) #define RDESKTOP_LICENSE_STORE "/.local/share/rdesktop/licenses" uint8 g_static_rdesktop_salt_16[16] = { @@ -1108,10 +1110,12 @@ return EX_PROTOCOL; /* check if auto reconnect cookie has timed out */ - if (time(NULL) - g_reconnect_random_ts > (3600 + 600)) + if (time(NULL) - g_reconnect_random_ts > RECONNECT_TIMEOUT) + { + fprintf(stderr, "Tried to reconnect for %d minutes, giving up.\n", RECONNECT_TIMEOUT/60); return EX_PROTOCOL; + } - fprintf(stderr, "Failed to connect, retry in 4 secs...\n"); sleep(4); continue; } @@ -1146,6 +1150,8 @@ /* handle network error and start autoreconnect */ if (g_network_error) { + fprintf(stderr, "Disconnected due to network error, retrying to reconnect for %d minutes.\n", + RECONNECT_TIMEOUT/60); g_network_error = False; reconnect_loop = True; continue; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-08-14 13:23:05
|
Revision: 1731 http://sourceforge.net/p/rdesktop/code/1731 Author: hean01 Date: 2013-08-14 13:23:01 +0000 (Wed, 14 Aug 2013) Log Message: ----------- Bitmap cache precaching is broken, tries to create bitmaps without window which results in a sigsegv. Workaround for bug #367 Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-08-14 12:56:52 UTC (rev 1730) +++ rdesktop/trunk/rdesktop.c 2013-08-14 13:23:01 UTC (rev 1731) @@ -87,7 +87,7 @@ RD_BOOL g_sendmotion = True; RD_BOOL g_bitmap_cache = True; RD_BOOL g_bitmap_cache_persist_enable = False; -RD_BOOL g_bitmap_cache_precache = True; +RD_BOOL g_bitmap_cache_precache = False; RD_BOOL g_use_ctrl = True; RD_BOOL g_encryption = True; RD_BOOL g_encryption_initial = True; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2013-09-17 13:27:34
|
Revision: 1740 http://sourceforge.net/p/rdesktop/code/1740 Author: astrand Date: 2013-09-17 13:27:31 +0000 (Tue, 17 Sep 2013) Log Message: ----------- Removed unused variable. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-09-17 13:11:22 UTC (rev 1739) +++ rdesktop/trunk/rdesktop.c 2013-09-17 13:27:31 UTC (rev 1740) @@ -510,7 +510,6 @@ #ifdef WITH_RDPSND char *rdpsnd_optarg = NULL; #endif - int longidx; #ifdef HAVE_LOCALE_H /* Set locale according to environment */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2013-09-17 13:32:18
|
Revision: 1741 http://sourceforge.net/p/rdesktop/code/1741 Author: astrand Date: 2013-09-17 13:32:16 +0000 (Tue, 17 Sep 2013) Log Message: ----------- Correct build warning caused by commit 1732. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-09-17 13:27:31 UTC (rev 1740) +++ rdesktop/trunk/rdesktop.c 2013-09-17 13:32:16 UTC (rev 1741) @@ -1733,7 +1733,7 @@ if (!ui_have_window()) { if (!ui_create_window()) - return EX_OSERR; + exit(EX_OSERR); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-09-27 08:18:38
|
Revision: 1748 http://sourceforge.net/p/rdesktop/code/1748 Author: hean01 Date: 2013-09-27 08:18:34 +0000 (Fri, 27 Sep 2013) Log Message: ----------- Initialize deactivate variable and make sure we check it to control reconnection logic. When hitting cancel at the logon dialog, server will send a deactivate PDU and close the socket the hard way. This behaviour introduce a problem when using SSL connection were rdesktop detected a network error and entered reconnection loop. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-09-19 14:45:22 UTC (rev 1747) +++ rdesktop/trunk/rdesktop.c 2013-09-27 08:18:34 UTC (rev 1748) @@ -1153,6 +1153,7 @@ rd_create_ui(); tcp_run_ui(True); + deactivated = False; g_redirect = False; g_reconnect_loop = False; rdp_main_loop(&deactivated, &ext_disc_reason); @@ -1166,7 +1167,7 @@ continue; /* handle network error and start autoreconnect */ - if (g_network_error) + if (g_network_error && !deactivated) { fprintf(stderr, "Disconnected due to network error, retrying to reconnect for %d minutes.\n", This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-11-28 15:13:59
|
Revision: 1769 http://sourceforge.net/p/rdesktop/code/1769 Author: hean01 Date: 2013-11-28 15:13:56 +0000 (Thu, 28 Nov 2013) Log Message: ----------- Redirect should not take the codepath as a reconnect which uses its own cookie and another code path. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-11-28 15:13:04 UTC (rev 1768) +++ rdesktop/trunk/rdesktop.c 2013-11-28 15:13:56 UTC (rev 1769) @@ -1126,7 +1126,7 @@ } ui_init_connection(); - if (!rdp_connect(server, flags, domain, password, shell, directory, g_redirect)) + if (!rdp_connect(server, flags, domain, password, shell, directory, g_reconnect_loop)) { g_network_error = False; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2013-12-04 11:45:41
|
Revision: 1770 http://sourceforge.net/p/rdesktop/code/1770 Author: hean01 Date: 2013-12-04 11:45:37 +0000 (Wed, 04 Dec 2013) Log Message: ----------- Fix issue with WTS 2003 and a case were a network error is triggered at a server redirect, preventing connection to the new server. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2013-11-28 15:13:56 UTC (rev 1769) +++ rdesktop/trunk/rdesktop.c 2013-12-04 11:45:37 UTC (rev 1770) @@ -1123,6 +1123,11 @@ fprintf(stderr, "Redirected to %s@%s session %d.\n", g_redirect_username, g_redirect_server, g_redirect_session_id); + + /* A redirect on SSL from a 2003 WTS will result in a 'connection reset by peer' + and therefor we just clear this error before we connect to redirected server. + */ + g_network_error = False; } ui_init_connection(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-02-07 07:33:06
|
Revision: 1784 http://sourceforge.net/p/rdesktop/code/1784 Author: hean01 Date: 2014-02-07 07:33:04 +0000 (Fri, 07 Feb 2014) Log Message: ----------- Initialize g_hostname at declaration. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-02-06 10:33:44 UTC (rev 1783) +++ rdesktop/trunk/rdesktop.c 2014-02-07 07:33:04 UTC (rev 1784) @@ -61,7 +61,7 @@ char g_title[64] = ""; char *g_username; -char g_hostname[16]; +char g_hostname[16] = ""; char g_keymapname[PATH_MAX] = ""; unsigned int g_keylayout = 0x409; /* Defaults to US keyboard layout */ int g_keyboard_type = 0x4; /* Defaults to US keyboard layout */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-02-19 08:02:10
|
Revision: 1788 http://sourceforge.net/p/rdesktop/code/1788 Author: hean01 Date: 2014-02-19 08:02:07 +0000 (Wed, 19 Feb 2014) Log Message: ----------- Clear memory before use. Fixes bug where hash of licensefilename differs between load and save. Thanks to Florent Peterschmitt for reporting,testing and patch. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-02-07 14:08:00 UTC (rev 1787) +++ rdesktop/trunk/rdesktop.c 2014-02-19 08:02:07 UTC (rev 1788) @@ -1678,6 +1678,7 @@ if (home == NULL) return -1; + memset(hi, 0, sizeof(hi)); snprintf((char *) hi, 16, "%s", g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); @@ -1726,6 +1727,7 @@ return; } + memset(hi, 0, sizeof(hi)); snprintf((char *) hi, 16, "%s", g_hostname); sec_hash_sha1_16(ho, hi, g_static_rdesktop_salt_16); sec_hash_to_string(hash, sizeof(hash), ho, sizeof(ho)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-03-12 06:22:32
|
Revision: 1792 http://sourceforge.net/p/rdesktop/code/1792 Author: hean01 Date: 2014-03-12 06:22:28 +0000 (Wed, 12 Mar 2014) Log Message: ----------- Add no_cursor_shadow to default performance flags. This fix the cursor issues on Window 2012 Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-03-06 11:43:43 UTC (rev 1791) +++ rdesktop/trunk/rdesktop.c 2014-03-12 06:22:28 UTC (rev 1792) @@ -111,7 +111,7 @@ RD_BOOL g_user_quit = False; uint32 g_embed_wnd; uint32 g_rdp5_performanceflags = - RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; + RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_CURSOR_SHADOW; /* Session Directory redirection */ RD_BOOL g_redirect = False; char *g_redirect_server; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-07-01 06:17:07
|
Revision: 1818 http://sourceforge.net/p/rdesktop/code/1818 Author: hean01 Date: 2014-07-01 06:17:02 +0000 (Tue, 01 Jul 2014) Log Message: ----------- Make sure to always add RDP5_NO_CURSOR_SHADOW even when specifying that nothing should be disabled in performance flags. This is a workaround for rdesktop not supporting alpha cursors. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-06-27 13:49:19 UTC (rev 1817) +++ rdesktop/trunk/rdesktop.c 2014-07-01 06:17:02 UTC (rev 1818) @@ -782,21 +782,21 @@ case 'x': if (str_startswith(optarg, "m")) /* modem */ { - g_rdp5_performanceflags = + g_rdp5_performanceflags = RDP5_NO_CURSOR_SHADOW | RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING; } else if (str_startswith(optarg, "b")) /* broadband */ { - g_rdp5_performanceflags = RDP5_NO_WALLPAPER; + g_rdp5_performanceflags = RDP5_NO_CURSOR_SHADOW | RDP5_NO_WALLPAPER; } else if (str_startswith(optarg, "l")) /* lan */ { - g_rdp5_performanceflags = RDP5_DISABLE_NOTHING; + g_rdp5_performanceflags = RDP5_NO_CURSOR_SHADOW | RDP5_DISABLE_NOTHING; } else { - g_rdp5_performanceflags = strtol(optarg, NULL, 16); + g_rdp5_performanceflags = RDP5_NO_CURSOR_SHADOW | strtol(optarg, NULL, 16); } break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-07-02 08:05:38
|
Revision: 1819 http://sourceforge.net/p/rdesktop/code/1819 Author: hean01 Date: 2014-07-02 08:05:30 +0000 (Wed, 02 Jul 2014) Log Message: ----------- Fix compile error introduced in previous commit. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-07-01 06:17:02 UTC (rev 1818) +++ rdesktop/trunk/rdesktop.c 2014-07-02 08:05:30 UTC (rev 1819) @@ -637,7 +637,7 @@ break; #ifdef WITH_SCARD case 'i': - flags |= RDP_LOGON_PASSWORD_IS_SC_PIN; + flags |= RDP_INFO_PASSWORD_IS_SC_PIN; g_use_password_as_pin = True; break; #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <he...@us...> - 2014-09-02 10:24:47
|
Revision: 1827 http://sourceforge.net/p/rdesktop/code/1827 Author: hean01 Date: 2014-09-02 10:24:40 +0000 (Tue, 02 Sep 2014) Log Message: ----------- Make sure we close the connection before redirect. Complementary fix for commit r1825. Revision Links: -------------- http://sourceforge.net/p/rdesktop/code/1825 Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2014-08-29 10:57:24 UTC (rev 1826) +++ rdesktop/trunk/rdesktop.c 2014-09-02 10:24:40 UTC (rev 1827) @@ -1159,7 +1159,10 @@ } if (g_redirect) + { + rdp_disconnect(); continue; + } /* By setting encryption to False here, we have an encrypted login packet but unencrypted transfer of other packets */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <as...@us...> - 2015-03-13 08:57:27
|
Revision: 1847 http://sourceforge.net/p/rdesktop/code/1847 Author: astrand Date: 2015-03-13 08:57:20 +0000 (Fri, 13 Mar 2015) Log Message: ----------- Update the visible copyright year. Modified Paths: -------------- rdesktop/trunk/rdesktop.c Modified: rdesktop/trunk/rdesktop.c =================================================================== --- rdesktop/trunk/rdesktop.c 2015-02-11 14:33:57 UTC (rev 1846) +++ rdesktop/trunk/rdesktop.c 2015-03-13 08:57:20 UTC (rev 1847) @@ -167,7 +167,7 @@ { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); fprintf(stderr, - "Version " PACKAGE_VERSION ". Copyright (C) 1999-2011 Matthew Chapman et al.\n"); + "Version " PACKAGE_VERSION ". Copyright (C) 1999-2015 Matthew Chapman et al.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); fprintf(stderr, "Usage: %s [options] server[:port]\n", program); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |