scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-10-31 10:48:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

improves dns arguments used by curl; refactors curl command

Browse Source
This commit is contained in:
Jed Reynolds
2017-11-09 16:46:49 -08:00
parent 4b23927e9d
commit df0ca6ce3d
1 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
portal-check.pl
View File

@@ -132,11 +132,11 @@ $utils->log_cli("# $0 ".`date "+%Y-%m-%d %H:%M:%S"`);
# this is the --show_port options ("") # this is the --show_port options ("")
my @port_txt = (); my @port_txt = ();
my $port_mac = ''; our $port_mac = '';
my $port_dev = ''; our $port_dev = '';
my $port_ip = ''; our $port_ip = '';
my $port_dns = ''; our $port_dns = '';
my $port_gateway = ''; our $port_gateway = '';
if ((defined $::sta) && ("$sta" ne "")) { if ((defined $::sta) && ("$sta" ne "")) {
@port_txt = split("\n", $utils->doAsyncCmd("nc_show_port 1 $::resource $::sta")); @port_txt = split("\n", $utils->doAsyncCmd("nc_show_port 1 $::resource $::sta"));
} }
@@ -213,12 +213,23 @@ else {
print "Not checking DNS\n"; print "Not checking DNS\n";
} }
sub assembleCurl {
return qq(/home/lanforge/local/bin/curl -svLki -4 -m30 --connect-timeout 15 )
.qq( --interface $port_dev )
.qq( --localaddr $port_ip )
.qq( --dns-interface $port_dev )
.qq( --dns-ipv4-addr $port_ip )
.qq( --dns-servers $::port_dns )
.join(" ", @_);
}
print "\nChecking redirect to http://1.1.1.1/ ...\n"; print "\nChecking redirect to http://1.1.1.1/ ...\n";
print("\n/home/lanforge/local/bin/curl -svLki -4 -m30 --connect-timeout 15 --interface $port_dev --localaddr $port_ip --dns-interface $port_dev --dns-ipv4-addr $port_ip http://1.1.1.1/\n"); my $cmd = assembleCurl(qw("http://1.1.1.1/"));
system("/home/lanforge/local/bin/curl -svLki -4 -m30 --connect-timeout 15 --interface $port_dev --localaddr $port_ip --dns-interface $port_dev --dns-ipv4-addr $port_ip http://1.1.1.1/"); print("\n$cmd\n");
system("$cmd");
print "\n\nChecking redirect to http://www.slashdot.org/ ...\n"; print "\n\nChecking redirect to http://www.slashdot.org/ ...\n";
print("\n/home/lanforge/local/bin/curl -svLki -4 -m30 --connect-timeout 15 --interface $port_dev --localaddr $port_ip --dns-interface $port_dev --dns-ipv4-addr $port_ip http://www.slashdot.org/\n"); $cmd = assembleCurl(qw("http://www.slashdot.org/"));
system("/home/lanforge/local/bin/curl -svLki -4 -m30 --connect-timeout 15 --interface $port_dev --localaddr $port_ip --dns-interface $port_dev --dns-ipv4-addr $port_ip http://www.slashdot.org/"); print("\n$cmd\n");
system("$cmd");
print "\n\n"; print "\n\n";
# #