snmpit: snmpit_cisco returns " ", not null, when it cannot get speed/duplex

so -B now ignores that rather than warning.

snmpit_cisco: hack to get around 2950 switch returning just <port>
rather than <module>.<port> in interface info tables.

Note: snmpit_cisco does not successfully return speed/duplex info for -b,
this may cause problems with whack-on-lan and needs to be fixed!

tbsetup/snmpit.in

@@ -997,7 +997,7 @@ sub doRestorePortStatus($@) {
     # Set the speed and duplex on the port if given
     #
     my $speed = $params{speed};
-    if ($speed) {
+    if ($speed && $speed ne " ") {
         if ($speed eq "autoDetect") {
             $errors = $stack->portControl("auto",$port);
         } else {
@@ -1013,7 +1013,7 @@ sub doRestorePortStatus($@) {
         }
     }
     my $duplex = $params{duplex};
-    if ($duplex) {
+    if ($duplex && $duplex ne " ") {
         if ($duplex eq "half") {
             $errors = $stack->portControl("half",$port);
         } elsif ($duplex eq "full") {

tbsetup/snmpit_cisco.pm

@@ -2,7 +2,7 @@
 
 #
 # EMULAB-LGPL
-# Copyright (c) 2000-2004 University of Utah and the Flux Group.
+# Copyright (c) 2000-2005 University of Utah and the Flux Group.
 # All rights reserved.
 #
 
@@ -1223,8 +1223,13 @@ sub listPorts($) {
 	    @data = @{$ifTable};
 	}
 	if (! defined $self->{IFINDEX}{$data[1]}) { next; }
-	my $port = portnum("$self->{NAME}:$data[1]")
+	my $port;
+	if ($data[1] =~ /\d+\.\d+/) {
+	    $port = portnum("$self->{NAME}:$data[1]")
 		|| portnum("$self->{NAME}:".$self->{IFINDEX}{$data[1]});
+	} else {
+	    $port = portnum("$self->{NAME}:".$self->{IFINDEX}{$data[1]});
+	}
 	if (! defined $port) { next; }
 	$self->debug("$port\t$data[0]\t$data[2]\n",2);
 	if    ($data[0]=~/AdminStatus/) {$Able{$port}=($data[2]=~/up/?"yes":"no");}
@@ -1565,8 +1570,8 @@ sub readifIndex($) {
                     #
                     if (($module == 0) && ($type =~ /^gi/i)) {
                         $module = 1;
-                        $self->debug("NON_MODULAR_HACK: Moving $descr to mod
-                            $module");
+                        $self->debug("NON_MODULAR_HACK: ".
+				     "Moving $descr to mod $module\n");
                     }
                 }
 		my $modport = "$module.$port";