Changeset 9b3627e for fedkit/gateway_lib.pm

Timestamp:

Mar 9, 2010 1:08:05 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-3.01, version-3.02

Children:

4e9719b

Parents:

c2c153b

Message:

SEER support

File:

• fedkit/gateway_lib.pm (modified) (2 diffs)

fedkit/gateway_lib.pm

@@ -367 +367 @@
 
 
+sub client_conf_filename {
+    # Find the configuration file in the usual places, if there is one in
+    # /usr/local/federation/etc, use it, otherwise look in the emulab standard
+    # filesystems which depends on what experiment and project we're in.
+    my $pid;
+    my $eid;
+    my $filename;
+    my $fed_dir = "/usr/local/federation/etc/";
+
+    return "$fed_dir/client.conf" if -r "$fed_dir/client.conf";
+
+    my $tmcd = new IO::Pipe() || die "Can't create pipe: $!\n";
+
+    $tmcd->reader("$TMCC status");
+
+    while (<$tmcd>) {
+        chomp;
+        /ALLOCATED=([^\/]+)\/(\S+)/ && do {
+            $pid = $1;
+            $eid = $2;
+        };
+    }
+    $tmcd->close();
+    $filename = "/proj/$pid/exp/$eid/tmp/client.conf"
+        if $pid and $eid;
+
+    return $filename;
+}
+
 sub wait_for_port {
     my($addr, $port, $timeout, $sleep) = @_;
@@ -376 +405 @@
 
     while (!$s) {
+        # We've seen some arp pollution, so be proactive about clearing the
+        # cache if we're waiting to get out.
+        system("arp -d -a");
         if (!($s = new IO::Socket(Domain => &AF_INET, PeerAddr => $addr, 
             PeerPort => $port))) {