You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by db...@apache.org on 2011/01/11 09:45:37 UTC
svn commit: r1057521 -
/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
Author: dbaum
Date: Tue Jan 11 08:45:37 2011
New Revision: 1057521
URL: http://svn.apache.org/viewvc?rev=1057521&view=rev
Log:
listen on 127.0.0.1 by default; add --ip to specify listen address. FELIX-2767
Modified:
felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
Modified: felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java
URL: http://svn.apache.org/viewvc/felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java?rev=1057521&r1=1057520&r2=1057521&view=diff
==============================================================================
--- felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java (original)
+++ felix/trunk/gogo/shell/src/main/java/org/apache/felix/gogo/shell/Telnet.java Tue Jan 11 08:45:37 2011
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.PrintStream;
import java.net.ServerSocket;
import java.net.Socket;
+import java.net.InetAddress;
import java.util.List;
import org.apache.felix.gogo.options.Option;
@@ -43,6 +44,7 @@ public class Telnet implements Runnable
private Thread thread;
private boolean quit;
private int port;
+ private String ip;
public Telnet(CommandProcessor procesor)
{
@@ -52,7 +54,8 @@ public class Telnet implements Runnable
public void telnetd(String[] argv) throws IOException
{
final String[] usage = { "telnetd - start simple telnet server",
- "Usage: telnetd [-p port] start | stop | status",
+ "Usage: telnetd [-i ip] [-p port] start | stop | status",
+ " -i --ip=INTERFACE listen interface (default=127.0.0.1)",
" -p --port=PORT listen port (default=" + defaultPort + ")",
" -? --help show help" };
@@ -74,6 +77,7 @@ public class Telnet implements Runnable
throw new IllegalStateException("telnetd is already running on port "
+ port);
}
+ ip = opt.get("ip");
port = opt.getNumber("port");
start();
status();
@@ -100,7 +104,7 @@ public class Telnet implements Runnable
{
if (server != null)
{
- System.out.println("telnetd is running on port " + port);
+ System.out.println("telnetd is running on " + ip + ":" + port);
}
else
{
@@ -111,7 +115,7 @@ public class Telnet implements Runnable
private void start() throws IOException
{
quit = false;
- server = new ServerSocket(port);
+ server = new ServerSocket(port, 0, InetAddress.getByName(ip));
thread = new Thread(this, "gogo telnet");
thread.start();
}