/[rdesktop]/sourceforge.net/trunk/rdesktop/rdesktop.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/rdesktop.c

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

revision 416 by forsberg, Fri Jun 6 11:11:20 2003 UTC revision 435 by astrand, Wed Jul 9 09:18:20 2003 UTC
# Line 55  BOOL bitmap_compression = True; Line 55  BOOL bitmap_compression = True;
55  BOOL sendmotion = True;  BOOL sendmotion = True;
56  BOOL orders = True;  BOOL orders = True;
57  BOOL encryption = True;  BOOL encryption = True;
58    BOOL packet_encryption = True;
59  BOOL desktop_save = True;  BOOL desktop_save = True;
60  BOOL fullscreen = False;  BOOL fullscreen = False;
61  BOOL grab_keyboard = True;  BOOL grab_keyboard = True;
# Line 94  usage(char *program) Line 95  usage(char *program)
95          fprintf(stderr, "   -f: full-screen mode\n");          fprintf(stderr, "   -f: full-screen mode\n");
96          fprintf(stderr, "   -b: force bitmap updates\n");          fprintf(stderr, "   -b: force bitmap updates\n");
97          fprintf(stderr, "   -e: disable encryption (French TS)\n");          fprintf(stderr, "   -e: disable encryption (French TS)\n");
98            fprintf(stderr, "   -E: disable encryption of everything but the logon packet\n");
99          fprintf(stderr, "   -m: do not send motion events\n");          fprintf(stderr, "   -m: do not send motion events\n");
100          fprintf(stderr, "   -C: use private colour map\n");          fprintf(stderr, "   -C: use private colour map\n");
101          fprintf(stderr, "   -K: keep window manager key bindings\n");          fprintf(stderr, "   -K: keep window manager key bindings\n");
# Line 149  main(int argc, char *argv[]) Line 151  main(int argc, char *argv[])
151          char password[16];          char password[16];
152          char shell[128];          char shell[128];
153          char directory[32];          char directory[32];
154          BOOL prompt_password;          BOOL prompt_password, rdp_retval = False;
155          struct passwd *pw;          struct passwd *pw;
156          uint32 flags;          uint32 flags;
157          char *p;          char *p;
# Line 167  main(int argc, char *argv[]) Line 169  main(int argc, char *argv[])
169  #define VNCOPT  #define VNCOPT
170  #endif  #endif
171    
172          while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbemCKT:Dh?54")) != -1)          while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:Dh?54")) != -1)
173          {          {
174                  switch (c)                  switch (c)
175                  {                  {
# Line 272  main(int argc, char *argv[]) Line 274  main(int argc, char *argv[])
274                          case 'e':                          case 'e':
275                                  encryption = False;                                  encryption = False;
276                                  break;                                  break;
277                            case 'E':
278                                    packet_encryption = False;
279                                    break;
280                          case 'm':                          case 'm':
281                                  sendmotion = False;                                  sendmotion = False;
282                                  break;                                  break;
# Line 366  main(int argc, char *argv[]) Line 370  main(int argc, char *argv[])
370    
371  #ifdef RDP2VNC  #ifdef RDP2VNC
372          rdp2vnc_connect(server, flags, domain, password, shell, directory);          rdp2vnc_connect(server, flags, domain, password, shell, directory);
373            return 0;
374  #else  #else
375    
376          if (!ui_init())          if (!ui_init())
377                  return 1;                  return 1;
378    
379          ipc_init();             // Must be run after ui_init, we need X to be setup.          /* rdpsnd_init(); */
380            /* rdpdr_init(); */
         if (use_rdp5)  
                 cliprdr_init(); // FIXME: Should perhaps be integrated into the channel management code?  
381    
382          if (!rdp_connect(server, flags, domain, password, shell, directory))          if (!rdp_connect(server, flags, domain, password, shell, directory))
383                  return 1;                  return 1;
384    
385            /* By setting encryption to False here, we have an encrypted login
386               packet but unencrypted transfer of other packets */
387            if (!packet_encryption)
388                    encryption = False;
389    
390    
391          DEBUG(("Connection successful.\n"));          DEBUG(("Connection successful.\n"));
392          memset(password, 0, sizeof(password));          memset(password, 0, sizeof(password));
393    
394          if (ui_create_window())          if (ui_create_window())
395          {          {
396                  rdp_main_loop();                  rdp_retval = rdp_main_loop();
397                  ui_destroy_window();                  ui_destroy_window();
398          }          }
399    
# Line 392  main(int argc, char *argv[]) Line 401  main(int argc, char *argv[])
401          rdp_disconnect();          rdp_disconnect();
402          ui_deinit();          ui_deinit();
403    
404            if (True == rdp_retval)
405                    return 0;
406            else
407                    return 2;
408    
409  #endif  #endif
410    
         return 0;  
411  }  }
412    
413  #ifdef EGD_SOCKET  #ifdef EGD_SOCKET
Legend:
Removed from v.416  
changed lines
  Added in v.435
  ViewVC Help
Powered by ViewVC 1.1.26