Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaronjwood
aaronjwood committed Jun 14, 2015
2 parents de97e61 + 48b8dae commit c863458
Show file tree
Hide file tree
Showing 6 changed files with 153 additions and 140 deletions.
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.aaronjwood.portauthority"
android:installLocation="auto"
android:versionCode="13"
android:versionName="1.5.0">
android:versionCode="14"
android:versionName="1.5.2">

<uses-sdk
android:minSdkVersion="14"
Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/com/aaronjwood/portauthority/runnable/ScanHostsRunnable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
import com.aaronjwood.portauthority.response.MainAsyncResponse;

import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;

public class ScanHostsRunnable implements Runnable {

Expand Down Expand Up @@ -37,8 +38,11 @@ public void run() {
for(int i = this.start; i <= this.stop; i++) {
String newIp = this.ipParts[0] + "." + this.ipParts[1] + "." + this.ipParts[2] + "." + i;
try {
InetAddress address = InetAddress.getByName(newIp);
address.isReachable(100);
Socket socket = new Socket();
socket.setReuseAddress(true);
socket.setPerformancePreferences(1, 0, 0);
socket.setTcpNoDelay(true);
socket.connect(new InetSocketAddress(newIp, 7), 100);
}
catch(IOException ignored) {
}
Expand Down
51 changes: 26 additions & 25 deletions app/src/main/java/com/aaronjwood/portauthority/runnable/ScanPortsRunnable.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,43 +44,44 @@ public void run() {
this.delegate.processFinish(1);
Socket socket = new Socket();
socket.setReuseAddress(true);
socket.setPerformancePreferences(1, 0, 0);
socket.setTcpNoDelay(true);
socket.connect(new InetSocketAddress(this.ip, i), 3500);

char[] buffer = new char[1024];
HashMap<Integer, String> portData = new HashMap<>();
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
String data = null;

if(i == 80 || i == 443 || i == 22) {
BufferedReader in = new BufferedReader(new InputStreamReader(socket.getInputStream()));
if(i == 22) {
data = in.readLine();
in.close();
}
else if(i == 80 || i == 443) {
PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
out.println("GET / HTTP/1.1\r\n\r\n");

String data;
out.println("GET / HTTP/1.1");
out.println("Host: " + this.ip);
out.println("");

if(i == 22) {
data = in.readLine();
in.read(buffer, 0, 1024);
out.close();
in.close();
data = new String(buffer).toLowerCase();
if(data.contains("apache") || data.contains("httpd")) {
data = "Apache";
}
else if(data.contains("iis") || data.contains("microsoft")) {
data = "IIS";
}
else if(data.contains("nginx")) {
data = "Nginx";
}
else {
in.read(buffer, 0, 1024);
data = new String(buffer).toLowerCase();
if(data.contains("apache") || data.contains("httpd")) {
data = "Apache";
}
else if(data.contains("iis") || data.contains("microsoft")) {
data = "IIS";
}
else if(data.contains("nginx")) {
data = "Nginx";
}
data = null;
}

portData.put(i, data);
out.close();
in.close();
}
else {
portData.put(i, null);
}

portData.put(i, data);
socket.close();

this.delegate.processFinish(portData);
Expand Down
104 changes: 52 additions & 52 deletions app/src/main/res/layout-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,93 +1,93 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black">

<TextView
android:id="@+id/textView"
android:layout_width="1dp"
android:layout_height="wrap_content"
android:id="@+id/textView"
android:singleLine="false"
android:layout_alignBottom="@+id/bssidLabel"
android:layout_below="@+id/deviceInfoLabel"
android:layout_centerHorizontal="true"
android:layout_alignBottom="@+id/bssidLabel"
android:background="@color/icsblue"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"/>
android:layout_marginRight="5dp"
android:background="@color/icsblue"
android:singleLine="false" />

<TextView
android:id="@+id/programTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:paddingBottom="20dp"
android:textSize="30dp"
android:text="@string/app_name"
android:textColor="@color/white"/>
android:textColor="@color/white"
android:textSize="30dp" />

<TextView
android:id="@+id/deviceInfoLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_below="@id/programTitle"
android:layout_centerHorizontal="true"
android:text="@string/deviceInfoLabel"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/icsblue"/>
android:textColor="@color/icsblue" />

<TextView
android:id="@+id/deviceMacAddressLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/deviceInfoLabel"
android:layout_toLeftOf="@+id/deviceMacAddress"
android:layout_toStartOf="@+id/programTitle"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/macAddress"
android:textColor="@color/white"
android:layout_toStartOf="@+id/programTitle"
android:layout_toLeftOf="@+id/deviceMacAddress"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/deviceMacAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue"
android:layout_above="@+id/externalIpAddressLabel"
android:layout_below="@+id/deviceInfoLabel"
android:layout_toLeftOf="@+id/textView"/>
android:layout_toLeftOf="@+id/textView"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue" />

<TextView
android:id="@+id/internalIpAddressLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/internalIpAddress"
android:layout_below="@+id/deviceInfoLabel"
android:layout_toLeftOf="@+id/internalIpAddress"
android:layout_toRightOf="@+id/textView"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/internalIpLabel"
android:textColor="@color/white"
android:layout_toRightOf="@+id/textView"
android:layout_alignBottom="@+id/internalIpAddress"
android:layout_toLeftOf="@+id/internalIpAddress"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/internalIpAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/deviceInfoLabel"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue"
android:layout_below="@+id/deviceInfoLabel"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"/>
android:textColor="@color/icsblue" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/internalIpAddress"
android:background="@color/icsblue"/>
android:background="@color/icsblue" />

<TextView
android:id="@+id/externalIpAddressLabel"
Expand All @@ -99,32 +99,32 @@
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/externalIpLabel"
android:textColor="@color/white"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/externalIpAddress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/internalIpAddressLabel"
android:layout_toLeftOf="@+id/textView"
android:layout_toStartOf="@+id/textView"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/fetching"
android:textColor="@color/icsblue"
android:layout_below="@+id/internalIpAddressLabel"
android:layout_toStartOf="@+id/textView"
android:layout_toLeftOf="@+id/textView"/>
android:textColor="@color/icsblue" />

<TextView
android:id="@+id/signalStrengthLabel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@+id/internalIpAddressLabel"
android:layout_toEndOf="@+id/textView"
android:layout_toLeftOf="@+id/signalStrength"
android:layout_toRightOf="@+id/textView"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/signalLabel"
android:textColor="@color/white"
android:layout_toRightOf="@+id/textView"
android:layout_toEndOf="@+id/textView"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/signalStrength"
Expand All @@ -134,48 +134,48 @@
android:layout_below="@+id/internalIpAddressLabel"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue"/>
android:textColor="@color/icsblue" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/signalStrength"
android:background="@color/icsblue"/>
android:background="@color/icsblue" />

<TextView
android:id="@+id/ssidLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_below="@id/externalIpAddress"
android:layout_toLeftOf="@+id/ssid"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/ssid"
android:textColor="@color/white"
android:layout_toLeftOf="@+id/ssid"
android:layout_below="@id/externalIpAddress"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/ssid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/externalIpAddressLabel"
android:layout_toLeftOf="@+id/textView"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue"
android:layout_toLeftOf="@+id/textView"/>
android:textColor="@color/icsblue" />

<TextView
android:id="@+id/bssidLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/signalStrengthLabel"
android:layout_toLeftOf="@+id/bssid"
android:layout_toRightOf="@+id/textView"
android:layout_toStartOf="@+id/bssid"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:text="@string/bssid"
android:textColor="@color/white"
android:layout_below="@+id/signalStrengthLabel"
android:layout_toRightOf="@+id/textView"
android:layout_toLeftOf="@+id/bssid"
android:layout_toStartOf="@+id/bssid"/>
android:textColor="@color/white" />

<TextView
android:id="@+id/bssid"
Expand All @@ -185,13 +185,13 @@
android:layout_below="@+id/signalStrengthLabel"
android:paddingBottom="5dp"
android:paddingTop="5dp"
android:textColor="@color/icsblue"/>
android:textColor="@color/icsblue" />

<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/bssid"
android:background="@color/icsblue"/>
android:background="@color/icsblue" />

<LinearLayout
android:layout_width="match_parent"
Expand All @@ -211,11 +211,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/button"
android:textSize="14dp"
android:minHeight="1dp"
android:minWidth="1dp"
android:text="@string/hostDiscovery"
android:textColor="@drawable/button_text"/>
android:textColor="@drawable/button_text"
android:textSize="14dp" />
</LinearLayout>

</RelativeLayout>
Loading

0 comments on commit c863458

Please sign in to comment.