Diff for /loncom/Attic/lonc between versions 1.48 and 1.49

version 1.48, 2003/03/18 22:51:03 version 1.49, 2003/03/27 23:00:28
Line 64  $status=''; Line 64  $status='';
 $lastlog='';  $lastlog='';
 $conserver='SHELL';  $conserver='SHELL';
 $DEBUG = 0; # Set to 1 for annoyingly complete logs.  $DEBUG = 0; # Set to 1 for annoyingly complete logs.
   $VERSION='$Revison$'; #' stupid emacs
   $remoteVERSION;
 # -------------------------------- Set signal handlers to record abnormal exits  # -------------------------------- Set signal handlers to record abnormal exits
   
 &status("Init exception handlers");  &status("Init exception handlers");
Line 702  sub openremote { Line 703  sub openremote {
   
     my $conserver=shift;      my $conserver=shift;
   
 &status("Opening TCP $conserver");      &status("Opening TCP $conserver");
     my $st=120+int(rand(240)); # Sleep before opening:      my $st=120+int(rand(240)); # Sleep before opening:
   
 unless (      unless (
   $remotesock = IO::Socket::INET->new(PeerAddr => $hostip{$conserver},      $remotesock = IO::Socket::INET->new(PeerAddr => $hostip{$conserver},
                                       PeerPort => $perlvar{'londPort'},   PeerPort => $perlvar{'londPort'},
                                       Proto    => "tcp",   Proto    => "tcp",
                                       Type     => SOCK_STREAM)   Type     => SOCK_STREAM)
    ) {      ) {
   
        &logthis(   &logthis(
 "<font color=blue>WARNING: Couldn't connect to $conserver ($st secs): </font>");   "<font color=blue>WARNING: Couldn't connect to $conserver ($st secs): </font>");
        sleep($st);   sleep($st);
        exit;    exit;
      };      };
 # ----------------------------------------------------------------- Init dialog  # ----------------------------------------------------------------- Init dialog
   
 &logthis("<font color=green>INFO Connected to $conserver, initing </font>");      &logthis("<font color=green>INFO Connected to $conserver, initing</font>");
 &status("Init dialogue: $conserver");      &status("Init dialogue: $conserver");
   
     $answer = londtransaction($remotesock, "init:$conserver", 60);      $answer = londtransaction($remotesock, "init", 60);
     chomp($answer);      chomp($answer);
     $answer = londtransaction($remotesock, $answer, 60);      $answer = londtransaction($remotesock, $answer, 60);
     chomp($answer);      chomp($answer);
    
      if ($@=~/timeout/) {  
  &logthis("Timed out during init.. exiting");  
          exit;  
      }  
   
 if ($answer ne 'ok') {      if ($@=~/timeout/) {
        &logthis("Init reply: >$answer<");   &logthis("Timed out during init.. exiting");
        my $st=120+int(rand(240));   exit;
        &logthis(      }
 "<font color=blue>WARNING: Init failed ($st secs)</font>");  
        sleep($st);  
        exit;   
 }  
   
 sleep 5;      if ($answer ne 'ok') {
 &status("Ponging $conserver");   &logthis("Init reply: >$answer<");
 print $remotesock "pong\n";   my $st=120+int(rand(240));
 $answer=<$remotesock>;   &logthis("<font color=blue>WARNING: Init failed ($st secs)</font>");
 chomp($answer);   sleep($st);
 if ($answer!~/^$conserver/) {   exit;
    &logthis("Pong reply: >$answer<");      }
 }  
       $answer = londtransaction($remotesock,"sethost:$conserver",60);
       chomp($answer);
       if ( $answer ne 'ok') {
    &logthis('<font color="blue">WARNING: unable to specify remote host'.
    $answer.'</font>');
       }
   
       $answer = londtransaction($remotesock,"version:$VERSION",60);
       chomp($answer);
       if ($answer =~ /^version:/) {
    $remoteVERSION=(split(/:/,$answer))[1];
       } else {
    &logthis('<font color="blue">WARNING: request remote version failed :'.
    $answer.': my version is :'.$VERSION.':</font>');
       }
   
       sleep 5;
       &status("Ponging $conserver");
       print $remotesock "pong\n";
       $answer=<$remotesock>;
       chomp($answer);
       if ($answer!~/^$conserver/) {
    &logthis("Pong reply: >$answer<");
       }
 # ----------------------------------------------------------- Initialize cipher  # ----------------------------------------------------------- Initialize cipher
   
 &status("Initialize cipher");      &status("Initialize cipher");
 print $remotesock "ekey\n";      print $remotesock "ekey\n";
 my $buildkey=<$remotesock>;      my $buildkey=<$remotesock>;
 my $key=$conserver.$perlvar{'lonHostID'};      my $key=$conserver.$perlvar{'lonHostID'};
 $key=~tr/a-z/A-Z/;      $key=~tr/a-z/A-Z/;
 $key=~tr/G-P/0-9/;      $key=~tr/G-P/0-9/;
 $key=~tr/Q-Z/0-9/;      $key=~tr/Q-Z/0-9/;
 $key=$key.$buildkey.$key.$buildkey.$key.$buildkey;      $key=$key.$buildkey.$key.$buildkey.$key.$buildkey;
 $key=substr($key,0,32);      $key=substr($key,0,32);
 my $cipherkey=pack("H32",$key);      my $cipherkey=pack("H32",$key);
 if ($cipher=new IDEA $cipherkey) {      if ($cipher=new IDEA $cipherkey) {
    &logthis("Secure connection initialized");   &logthis("Secure connection initialized");
 } else {      } else {
    my $st=120+int(rand(240));   my $st=120+int(rand(240));
    &logthis(   &logthis("<font color=blue>WARNING: ".
      "<font color=blue>WARNING: ".   "Could not establish secure connection ($st secs)!</font>");
      "Could not establish secure connection ($st secs)!</font>");   sleep($st);
    sleep($st);   exit;
    exit;      }
 }  
     &logthis("<font color=green> Remote open success </font>");      &logthis("<font color=green> Remote open success </font>");
 }  }
   
Line 979  sub londtransaction { Line 994  sub londtransaction {
  die("lonc - suiciding on send Timeout");   die("lonc - suiciding on send Timeout");
     }      }
     if ($@ =~ /timeout/) {      if ($@ =~ /timeout/) {
  &logthis("lonc - suiciding on send Timeout");   &logthis("lonc - suiciding on read Timeout");
  die("lonc - suiciding on send Timeout");   die("lonc - suiciding on read Timeout");
     }      }
     #      #
     # Restore the initial sigmask set.      # Restore the initial sigmask set.

Removed from v.1.48  
changed lines
  Added in v.1.49


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>