happyz
/
mobile-offloading
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug fix

This commit is contained in:
HappyZ 2017-02-21 21:34:24 -08:00
parent 1594f0ad43
commit 710fbcea30
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/MainActivity.java
View File

@ -206,7 +206,7 @@ class MainActivity extends Activity {
EditText edit_remote_mac = (EditText) findViewById(R.id.remote_mac);
String string_remote_ip = edit_remote_ip.getText().toString();
String string_remote_mac = edit_remote_mac.getText().toString();
// check if ip is in valid format and reachable
// check if ip is in valid format
if (Utilities.validIP(string_remote_ip)) {
remoteIP = string_remote_ip;
} else {

10
OffloadingDemo/mobile/src/main/java/edu/ucsb/cs/sandlab/offloadingdemo/Utilities.java
View File

@ -575,13 +575,7 @@ class Utilities {
i = Integer.parseInt(s);
if ((i < 0) || (i > 255)) return false;
}
if (ip.endsWith(".")) return false;
// ping the ip and see if it is reachable
try {
return InetAddress.getByName(ip).isReachable(5);
} catch (IOException ignored) {
return false;
}
return !ip.endsWith(".");
}
/**
@ -592,7 +586,7 @@ class Utilities {
static boolean validMAC(String mac) {
// use regular expression to validate a mac address
// the only valid format is xx:xx:xx:xx:xx:xx
Pattern p = Pattern.compile("^([a-fA-F0-9][:]){5}[a-fA-F0-9][:]$");
Pattern p = Pattern.compile("/^([a-fA-F0-9]{2}:){5}[a-fA-F0-9]{2}$/");
Matcher m = p.matcher(mac);
return m.find();
}

2
OffloadingDemo/mobile/src/main/res/layout/activity_main.xml
View File

@ -157,7 +157,7 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2">
android:layout_weight="1.5">
<LinearLayout
android:layout_width="match_parent"