X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=clients%2Fzyxelng.pl;h=3d029967e80903ec2b6d41c73e1bb019c356eb24;hb=7c8aa8e94cc75dd4952b969c79cb45ddf3dd7985;hp=c6a0b1ef8fb0ea49f2d0bca7b3c146a14f9b7abb;hpb=a7b06039cea866e7c30218c2366515b0dbee652f;p=nms

diff --git a/clients/zyxelng.pl b/clients/zyxelng.pl
index c6a0b1e..3d02996 100644
--- a/clients/zyxelng.pl
+++ b/clients/zyxelng.pl
@@ -8,7 +8,7 @@ use lib '../include';
 use Data::Dumper;
 
 use nms qw(switch_connect switch_exec);
-use ios;
+#use ios;
 
 #my $t = nms::ios_connect('62.148.36.12', 'c', 'c', 'c');
 
@@ -16,58 +16,40 @@ use ios;
 
 #nms::ios_close($t);
 
+if ($#ARGV < 1) {
+	die "Not enough arguments to zyxelng.pl $#ARGV";
+}
+
+my $oldip = $ARGV[0];
+my $newip = $ARGV[1];
+#$switchname = $ARGV[2];
+
 my $one = 0;
 
 my $switchip;
 #$switchip = "87.76.250.226" if $one;
-$switchip = "192.168.2.150" if $one;
-$switchip = "192.168.1.1" unless $one;
-my $switch = switch_connect($switchip);
+#$switchip = "192.168.2.150" if $one;
+#$switchip = "192.168.1.1" unless $one;
+$switchip = $oldip;
+my $switch = switch_connect($switchip)
+	or die "Could not connect to $switchip";
 
 my $cmds1 = <<EOF
 sys hostname es-3024
 ip igmpsnoop enable
-
-sys sw vlan type 802.1q
-sys sw vlan1q svlan setentry MNGT 248 25 fixed tag
-sys sw vlan1q svlan active 248
-sys sw vlan1q svlan setentry e01-1sw 1 25 fixed untag
-
-sys sw vlan1q svlan setentry MNGT 248 1 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 2 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 3 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 4 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 5 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 6 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 7 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 8 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 9 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 10 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 11 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 12 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 13 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 14 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 15 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 16 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 17 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 18 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 19 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 20 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 21 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 22 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 23 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 24 forbidden tag
 EOF
 ;
-#
+
 foreach (split(/\n+/, $cmds1)) {
 	print "Sending: '$_'\n";
 	switch_exec($_, $switch);
 }
 
 my $cmd;
-$cmd = "ip ifconfig swif0 192.168.1.1/24" if $one;
-$cmd = "ip ifconfig swif0 192.168.2.150/24" unless $one;
+#$cmd = "ip ifconfig swif0 192.168.1.1/24" if $one;
+#$cmd = "ip ifconfig swif0 192.168.2.150/24" unless $one;
+$cmd = "ip ifconfig swif0 $newip/30";
+
 print "Sending '$cmd'\n";
 my $pid = fork();
 if ($pid == 0) {
@@ -80,30 +62,32 @@ if ($pid == 0) {
 	sleep 1;
 }
 $switch->close();
-print "Reconnecting... ";
-$switchip = "192.168.1.1" if $one;
-$switchip = "192.168.2.150" unless $one;
-autoflush STDOUT 1;
-print "Connecting to: $switchip...\n";
-my $i = 1;
-while(1) {
-	$switch = switch_connect($switchip);
-	
-	#print (defined($switch)? $switch : "foo") ." <---- switch\n";
-	if (defined($switch) || $switch) {
-		last;
-	}
-	printf("Waited $i seconds...\r");
-	$i++;
-	sleep 1;
-}
-print "\n";
 
-print $switch."\n";
-$cmd = "sys sw vlan1q svlan cpu 248";
-print "Sending '$cmd'\n";
+#print "Reconnecting... ";
+##$switchip = "192.168.1.1" if $one;
+##$switchip = "192.168.2.150" unless $one;
+#$switchip = $newip;
+#autoflush STDOUT 1;
+#print "Connecting to: $switchip...\n";
+#my $i = 1;
+#while(1) {
+#	$switch = switch_connect($switchip);
+#	
+#	#print (defined($switch)? $switch : "foo") ." <---- switch\n";
+#	if (defined($switch) || $switch) {
+#		last;
+#	}
+#	printf("Waited $i seconds...\r");
+#	$i++;
+#	sleep 1;
+#}
+#print "\n";
+
+#print $switch."\n";
+#$cmd = "sys sw vlan1q svlan cpu 248";
+#print "Sending '$cmd'\n";
 #print "XXX: No we did not...";
 #print Dumper($switch->cmd("ip ifconfig"));
 #print Dumper($switch->cmd("ip route status"));
-switch_exec($cmd, $switch, 1);
-$switch->close();
+#switch_exec($cmd, $switch, 1);
+