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

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

revision 222 by matthewc, Fri Oct 11 04:00:32 2002 UTC revision 259 by astrand, Mon Nov 18 15:30:12 2002 UTC
# Line 71  usage(char *program) Line 71  usage(char *program)
71          fprintf(stderr, "   -c: working directory\n");          fprintf(stderr, "   -c: working directory\n");
72          fprintf(stderr, "   -p: password (- to prompt)\n");          fprintf(stderr, "   -p: password (- to prompt)\n");
73          fprintf(stderr, "   -n: client hostname\n");          fprintf(stderr, "   -n: client hostname\n");
74          fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr etc.)\n");          fprintf(stderr, "   -k: keyboard layout on terminal server (us,sv,gr,etc.)\n");
75          fprintf(stderr, "   -g: desktop geometry (WxH)\n");          fprintf(stderr, "   -g: desktop geometry (WxH)\n");
76          fprintf(stderr, "   -f: full-screen mode\n");          fprintf(stderr, "   -f: full-screen mode\n");
77          fprintf(stderr, "   -b: force bitmap updates\n");          fprintf(stderr, "   -b: force bitmap updates\n");
78          fprintf(stderr, "   -e: disable encryption (French TS)\n");          fprintf(stderr, "   -e: disable encryption (French TS)\n");
79          fprintf(stderr, "   -m: do not send motion events\n");          fprintf(stderr, "   -m: do not send motion events\n");
80          fprintf(stderr, "   -K: keep window manager key bindings\n");          fprintf(stderr, "   -K: keep window manager key bindings\n");
81          fprintf(stderr, "   -w: window title\n");          fprintf(stderr, "   -T: window title\n");
82  }  }
83    
84  static BOOL  static BOOL
# Line 125  main(int argc, char *argv[]) Line 125  main(int argc, char *argv[])
125          char fullhostname[64];          char fullhostname[64];
126          char domain[16];          char domain[16];
127          char password[16];          char password[16];
128          char shell[32];          char shell[128];
129          char directory[32];          char directory[32];
130          BOOL prompt_password;          BOOL prompt_password;
131          struct passwd *pw;          struct passwd *pw;
# Line 136  main(int argc, char *argv[]) Line 136  main(int argc, char *argv[])
136          flags = RDP_LOGON_NORMAL;          flags = RDP_LOGON_NORMAL;
137          prompt_password = False;          prompt_password = False;
138          domain[0] = password[0] = shell[0] = directory[0] = 0;          domain[0] = password[0] = shell[0] = directory[0] = 0;
139          strcpy(keymapname, "us");          strcpy(keymapname, "en-us");
140    
141          while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKw:h?")) != -1)          while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKT:h?")) != -1)
142          {          {
143                  switch (c)                  switch (c)
144                  {                  {
# Line 214  main(int argc, char *argv[]) Line 214  main(int argc, char *argv[])
214                                  grab_keyboard = False;                                  grab_keyboard = False;
215                                  break;                                  break;
216    
217                          case 'w':                          case 'T':
218                                  STRNCPY(title, optarg, sizeof(title));                                  STRNCPY(title, optarg, sizeof(title));
219                                  break;                                  break;
220    
# Line 312  generate_random_egd(uint8 * buf) Line 312  generate_random_egd(uint8 * buf)
312    
313          addr.sun_family = AF_UNIX;          addr.sun_family = AF_UNIX;
314          memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET));          memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET));
315          if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1)          if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1)
316                  goto err;                  goto err;
317    
318          /* PRNGD and EGD use a simple communications protocol */          /* PRNGD and EGD use a simple communications protocol */
319          buf[0] = 1;  /* Non-blocking (similar to /dev/urandom) */          buf[0] = 1;             /* Non-blocking (similar to /dev/urandom) */
320          buf[1] = 32; /* Number of requested random bytes */          buf[1] = 32;            /* Number of requested random bytes */
321          if (write(fd, buf, 2) != 2)          if (write(fd, buf, 2) != 2)
322                  goto err;                  goto err;
323    
324          if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */          if ((read(fd, buf, 1) != 1) || (buf[0] == 0))   /* Available? */
325                  goto err;                  goto err;
326    
327          if (read(fd, buf, 32) != 32)          if (read(fd, buf, 32) != 32)
# Line 329  generate_random_egd(uint8 * buf) Line 329  generate_random_egd(uint8 * buf)
329    
330          ret = True;          ret = True;
331    
332  err:        err:
333          close(fd);          close(fd);
334          return ret;          return ret;
335  }  }
# Line 362  generate_random(uint8 * random) Line 362  generate_random(uint8 * random)
362  #endif  #endif
363    
364          /* Otherwise use whatever entropy we can gather - ideas welcome. */          /* Otherwise use whatever entropy we can gather - ideas welcome. */
365          r = (uint32 *)random;          r = (uint32 *) random;
366          r[0] = (getpid()) | (getppid() << 16);          r[0] = (getpid()) | (getppid() << 16);
367          r[1] = (getuid()) | (getgid() << 16);          r[1] = (getuid()) | (getgid() << 16);
368          r[2] = times(&tmsbuf);  /* system uptime (clocks) */          r[2] = times(&tmsbuf);  /* system uptime (clocks) */
# Line 374  generate_random(uint8 * random) Line 374  generate_random(uint8 * random)
374    
375          /* Hash both halves with MD5 to obscure possible patterns */          /* Hash both halves with MD5 to obscure possible patterns */
376          MD5_Init(&md5);          MD5_Init(&md5);
377          MD5_Update(&md5, random, 16);          MD5_Update(&md5, random, 16);
378          MD5_Final(random, &md5);          MD5_Final(random, &md5);
379          MD5_Update(&md5, random+16, 16);          MD5_Update(&md5, random + 16, 16);
380          MD5_Final(random+16, &md5);          MD5_Final(random + 16, &md5);
381  }  }
382    
383  /* malloc; exit if out of memory */  /* malloc; exit if out of memory */
Legend:
Removed from v.222  
changed lines
  Added in v.259
  ViewVC Help
Powered by ViewVC 1.1.26