[prev in list] [next in list] [prev in thread] [next in thread] 

List:       httpcomponents-commits
Subject:    svn commit: r500044 - in /jakarta/httpcomponents/httpcore/trunk:
From:       olegk () apache ! org
Date:       2007-01-25 23:11:58
Message-ID: 20070125231159.028BD1A981A () eris ! apache ! org
[Download RAW message or body]

Author: olegk
Date: Thu Jan 25 15:11:58 2007
New Revision: 500044

URL: http://svn.apache.org/viewvc?view=rev&rev=500044
Log:
Added #getRemotePort and #getLocalPort to the HttpInetConnection interface

Modified:
    jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java
  jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
  jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
  jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java


Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/sr \
c/main/java/org/apache/http/HttpInetConnection.java?view=diff&rev=500044&r1=500043&r2=500044
 ==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java \
                (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/HttpInetConnection.java \
Thu Jan 25 15:11:58 2007 @@ -46,6 +46,10 @@
 
     InetAddress getLocalAddress();
 
+    int getLocalPort();
+    
     InetAddress getRemoteAddress();
+
+    int getRemotePort();
     
 }

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/sr \
c/main/java/org/apache/http/impl/SocketHttpClientConnection.java?view=diff&rev=500044&r1=500043&r2=500044
 ==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java \
                (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpClientConnection.java \
Thu Jan 25 15:11:58 2007 @@ -120,11 +120,27 @@
         }
     }
 
+    public int getLocalPort() {
+        if (this.socket != null) {
+            return this.socket.getLocalPort();
+        } else {
+            return -1;
+        }
+    }
+
     public InetAddress getRemoteAddress() {
         if (this.socket != null) {
             return this.socket.getInetAddress();
         } else {
             return null;
+        }
+    }
+
+    public int getRemotePort() {
+        if (this.socket != null) {
+            return this.socket.getPort();
+        } else {
+            return -1;
         }
     }
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-main/sr \
c/main/java/org/apache/http/impl/SocketHttpServerConnection.java?view=diff&rev=500044&r1=500043&r2=500044
 ==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java \
                (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-main/src/main/java/org/apache/http/impl/SocketHttpServerConnection.java \
Thu Jan 25 15:11:58 2007 @@ -118,11 +118,27 @@
         }
     }
 
+    public int getLocalPort() {
+        if (this.socket != null) {
+            return this.socket.getLocalPort();
+        } else {
+            return -1;
+        }
+    }
+
     public InetAddress getRemoteAddress() {
         if (this.socket != null) {
             return this.socket.getInetAddress();
         } else {
             return null;
+        }
+    }
+
+    public int getRemotePort() {
+        if (this.socket != null) {
+            return this.socket.getPort();
+        } else {
+            return -1;
         }
     }
 

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java
                
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src \
/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java?view=diff&rev=500044&r1=500043&r2=500044
 ==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java \
                (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/impl/NHttpConnectionBase.java \
Thu Jan 25 15:11:58 2007 @@ -228,12 +228,30 @@
         }
     }
 
+    public int getLocalPort() {
+        SocketAddress address = this.session.getLocalAddress();
+        if (address instanceof InetSocketAddress) {
+            return ((InetSocketAddress) address).getPort();
+        } else {
+            return -1;
+        }
+    }
+
     public InetAddress getRemoteAddress() {
         SocketAddress address = this.session.getRemoteAddress();
         if (address instanceof InetSocketAddress) {
             return ((InetSocketAddress) address).getAddress();
         } else {
             return null;
+        }
+    }
+
+    public int getRemotePort() {
+        SocketAddress address = this.session.getRemoteAddress();
+        if (address instanceof InetSocketAddress) {
+            return ((InetSocketAddress) address).getPort();
+        } else {
+            return -1;
         }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]