Skip to content

Add WiFi hotspot port forwarding with bind address selection #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
steffen-heil-secforge wants to merge 1 commit into from
Closed

Add WiFi hotspot port forwarding with bind address selection #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<uses-sdk />

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.VIBRATE" />
Expand Down
28 changes: 9 additions & 19 deletions app/src/main/java/org/connectbot/ConsoleActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,13 +180,19 @@ public void onServiceConnected(ComponentName className, IBinder service) {
if (requestedBridge != null)
requestedBridge.promptHelper.setListener(promptListener);

if (requestedIndex != -1) {
// Check if this is a background connection (don't switch to console view)
boolean backgroundConnection = getIntent().getBooleanExtra("org.connectbot.BACKGROUND_CONNECTION", false);

if (requestedIndex != -1 && !backgroundConnection) {
pager.post(new Runnable() {
@Override
public void run() {
setDisplayedTerminal(requestedIndex);
}
});
} else if (backgroundConnection) {
// For background connections, finish the activity after connection is established
finish();
}
}

Expand Down Expand Up @@ -990,13 +996,6 @@ public void onPause() {
if (forcedOrientation && bound != null) {
bound.setResizeAllowed(false);
}

// Clear prompt listeners when activity is not visible to prevent stale references
if (bound != null) {
for (TerminalBridge bridge : bound.getBridges()) {
bridge.promptHelper.clearListener();
}
}
}

@Override
Expand All @@ -1014,13 +1013,6 @@ public void onResume() {

configureOrientation();

// Restore prompt listeners when activity becomes visible
if (bound != null) {
for (TerminalBridge bridge : bound.getBridges()) {
bridge.promptHelper.setListener(promptListener);
}
}

if (forcedOrientation && bound != null) {
bound.setResizeAllowed(true);
}
Expand Down Expand Up @@ -1257,6 +1249,7 @@ public Object instantiateItem(ViewGroup container, int position) {
Log.w(TAG, "Activity not bound when creating TerminalView.");
}
TerminalBridge bridge = bound.getBridges().get(position);
bridge.promptHelper.setListener(promptListener);

// inflate each terminal view
RelativeLayout view = (RelativeLayout) inflater.inflate(
Expand All @@ -1276,9 +1269,6 @@ public Object instantiateItem(ViewGroup container, int position) {

container.addView(view);
terminalNameOverlay.startAnimation(fade_out_delayed);

bridge.promptHelper.setListener(promptListener);

return view;
}

Expand Down Expand Up @@ -1351,7 +1341,7 @@ public TerminalView getCurrentTerminalView() {
if (currentView == null) {
return null;
}
return currentView.findViewById(R.id.terminal_view);
return (TerminalView) currentView.findViewById(R.id.terminal_view);
}
}
}
127 changes: 125 additions & 2 deletions app/src/main/java/org/connectbot/HostListActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@
import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.Spanned;
import android.text.format.DateUtils;
import android.text.style.StrikethroughSpan;
import android.util.Log;
import android.view.ContextMenu;
import android.view.LayoutInflater;
Expand All @@ -55,12 +59,14 @@
import android.widget.TextView;

import org.connectbot.bean.HostBean;
import org.connectbot.bean.PortForwardBean;
import org.connectbot.data.HostStorage;
import org.connectbot.service.OnHostStatusChangedListener;
import org.connectbot.service.TerminalBridge;
import org.connectbot.service.TerminalManager;
import org.connectbot.transport.TransportFactory;
import org.connectbot.util.HostDatabase;
import org.connectbot.util.NetworkUtils;
import org.connectbot.util.PreferenceConstants;

import java.util.List;
Expand Down Expand Up @@ -446,7 +452,13 @@ protected void updateList() {

@Override
public void onHostStatusChanged() {
updateList();
// Ensure UI updates happen on the main thread
runOnUiThread(new Runnable() {
@Override
public void run() {
updateList();
}
});
}

@VisibleForTesting
Expand All @@ -463,6 +475,46 @@ public HostViewHolder(View v) {
icon = v.findViewById(android.R.id.icon);
nickname = v.findViewById(android.R.id.text1);
caption = v.findViewById(android.R.id.text2);

// Add click listener for the icon to connect/disconnect
icon.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
handleIconClick();
}
});
}

/**
* Handle icon click to connect/disconnect host
*/
private void handleIconClick() {
if (host == null) {
return;
}

// Get the adapter from the parent activity to access the manager
HostAdapter adapter = (HostAdapter) mListView.getAdapter();
if (adapter == null || adapter.manager == null) {
return;
}

int state = adapter.getConnectedState(host);
if (state == HostAdapter.STATE_CONNECTED) {
// Disconnect if connected
TerminalBridge bridge = adapter.manager.getConnectedBridge(host);
if (bridge != null) {
bridge.dispatchDisconnect(true);
}
} else {
// Connect directly using the bound service
try {
Uri uri = host.getUri();
adapter.manager.openConnection(uri);
} catch (Exception e) {
Log.e(TAG, "Failed to open connection for host: " + host.getNickname(), e);
}
}
}

@Override
Expand Down Expand Up @@ -566,7 +618,7 @@ public void onClick(DialogInterface dialog, int which) {
}
}

@VisibleForTesting

private class HostAdapter extends ItemAdapter {
private final List<HostBean> hosts;
private final TerminalManager manager;
Expand Down Expand Up @@ -678,9 +730,80 @@ public void onBindViewHolder(ItemViewHolder holder, int position) {
nice = DateUtils.getRelativeTimeSpanString(host.getLastConnect() * 1000);
}

// For connected hosts, show port forwarding information
if (this.getConnectedState(host) == STATE_CONNECTED && this.manager != null) {
TerminalBridge bridge = this.manager.getConnectedBridge(host);
if (bridge != null) {
List<PortForwardBean> portForwards = bridge.getPortForwards();
if (portForwards != null && !portForwards.isEmpty()) {
SpannableStringBuilder portInfo = new SpannableStringBuilder();
for (int i = 0; i < portForwards.size(); i++) {
PortForwardBean forward = portForwards.get(i);
if (i > 0) {
portInfo.append("\n");
}
portInfo.append(getSimplePortForwardDescription(forward));
}
nice = portInfo;
}
}
}

hostHolder.caption.setText(nice);
}

/**
* Check if a port forward is dysfunctional (should be struck through)
* Uses the same logic as PortForwardListActivity: hostBridge != null && !forward.isEnabled()
* But adds special case for AP forwards when AP is unavailable
*/
private boolean isPortForwardDysfunctional(PortForwardBean forward) {
// Special case: AP forwards are dysfunctional when AP is not available
// regardless of their enabled state
if (NetworkUtils.BIND_ACCESS_POINT.equals(forward.getBindAddress())) {
String apIP = NetworkUtils.getAccessPointIP(context);
if (apIP == null) {
return true; // AP forward but no AP available = dysfunctional
}
}

// For all forwards (including AP when AP is available):
// Use the same logic as PortForwardListActivity
// Strike through if not enabled (connected but forward failed)
return !forward.isEnabled();
}

/**
* Generate a simplified port forward description with strike-through for dysfunctional forwards
*/
private CharSequence getSimplePortForwardDescription(PortForwardBean forward) {
String bindInfo = NetworkUtils.getSimpleBindAddressDisplay(forward.getBindAddress(), context);
String description;

if (HostDatabase.PORTFORWARD_LOCAL.equals(forward.getType())) {
description = String.format("Local %s:%d → %s:%d", bindInfo, forward.getSourcePort(),
forward.getDestAddr(), forward.getDestPort());
} else if (HostDatabase.PORTFORWARD_REMOTE.equals(forward.getType())) {
description = String.format("Remote %d → %s:%d", forward.getSourcePort(),
forward.getDestAddr(), forward.getDestPort());
} else if (HostDatabase.PORTFORWARD_DYNAMIC5.equals(forward.getType())) {
description = String.format("Dynamic %s:%d (SOCKS)", bindInfo, forward.getSourcePort());
} else {
description = "Unknown type";
}

// Apply strike-through only for dysfunctional port forwards
if (isPortForwardDysfunctional(forward)) {
SpannableString spannableDescription = new SpannableString(description);
spannableDescription.setSpan(new StrikethroughSpan(), 0, description.length(),
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
return spannableDescription;
}

return description;
}


@Override
public long getItemId(int position) {
return hosts.get(position).getId();
Expand Down
Loading