You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2009/01/30 23:43:37 UTC
svn commit: r739440 -
/felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java
Author: fmeschbe
Date: Fri Jan 30 22:43:37 2009
New Revision: 739440
URL: http://svn.apache.org/viewvc?rev=739440&view=rev
Log:
FELIX-826 Apply patch by Peter Triller (Thanks)
Modified:
felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java
Modified: felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java
URL: http://svn.apache.org/viewvc/felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java?rev=739440&r1=739439&r2=739440&view=diff
==============================================================================
--- felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java (original)
+++ felix/trunk/shell.remote/src/main/java/org/apache/felix/shell/remote/Listener.java Fri Jan 30 22:43:37 2009
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.PrintStream;
+import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import java.net.SocketException;
@@ -33,6 +34,7 @@
{
private int m_Port;
+ private String m_Ip;
private Thread m_ListenerThread;
private boolean m_Stop = false;
private ServerSocket m_ServerSocket;
@@ -46,6 +48,7 @@
public void activate( BundleContext bundleContext )
{
//configure from framework property
+ m_Ip = getProperty( bundleContext, "osgi.shell.telnet.ip", "127.0.0.1" );
m_Port = getProperty( bundleContext, "osgi.shell.telnet.port", 6666 );
m_MaxConnections = getProperty( bundleContext, "osgi.shell.telnet.maxconn", 2 );
m_UseCounter = new AtomicInteger( 0 );
@@ -101,7 +104,7 @@
should be handled properly, but denial of service attacks via massive parallel
program logins should be prevented with this.
*/
- m_ServerSocket = new ServerSocket( m_Port, 1 );
+ m_ServerSocket = new ServerSocket( m_Port, 1, InetAddress.getByName(m_Ip) );
do
{
try
@@ -162,4 +165,15 @@
return defaultValue;
}
+ private String getProperty( BundleContext bundleContext, String propName, String defaultValue )
+ {
+ String propValue = bundleContext.getProperty( propName );
+ if ( propValue != null )
+ {
+ return propValue;
+ }
+
+ return defaultValue;
+ }
+
}//class Listener