From eae4362181b8b182f4e19fdf34e3085456c348bd Mon Sep 17 00:00:00 2001
From: mkvore-commit <mkvore-commit@mail.i2p>
Date: Tue, 21 Apr 2009 04:14:53 +0000
Subject: [PATCH] SAMv3: NAMING ME request now work on stream sessions
---
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java | 7 ++++---
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java | 10 ++++++----
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
index e7d192aadd..7734ea5749 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
@@ -42,8 +42,9 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
protected SAMRawSession rawSession = null;
protected SAMDatagramSession datagramSession = null;
protected SAMStreamSession streamSession = null;
- protected SAMDatagramSession getDatagramSession() {return datagramSession ;}
protected SAMRawSession getRawSession() {return rawSession ;}
+ protected SAMDatagramSession getDatagramSession() {return datagramSession ;}
+ protected SAMStreamSession getStreamSession() {return streamSession ;}
protected long _id;
protected static volatile long __id = 0;
@@ -331,8 +332,8 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
if (name.equals("ME")) {
if (getRawSession() != null) {
dest = getRawSession().getDestination();
- } else if (streamSession != null) {
- dest = streamSession.getDestination();
+ } else if (getStreamSession() != null) {
+ dest = getStreamSession().getDestination();
} else if (getDatagramSession() != null) {
dest = getDatagramSession().getDestination();
} else {
diff --git a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
index f439b1253b..b629cc09a1 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
+++ b/apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
@@ -44,16 +44,18 @@ public class SAMv3Handler extends SAMv1Handler
{
private final static Log _log = new Log ( SAMv3Handler.class );
- protected SAMv3StreamSession streamSession = null ;
protected SAMv3RawSession rawSession = null ;
protected SAMv3DatagramSession datagramSession = null ;
+ protected SAMv3StreamSession streamSession = null ;
+ protected SAMRawSession getRawSession() {
+ return rawSession ;
+ }
protected SAMDatagramSession getDatagramSession() {
return datagramSession ;
}
-
- protected SAMRawSession getRawSession() {
- return rawSession ;
+ protected SAMStreamSession getStreamSession() {
+ return streamSession ;
}
protected Session session = null ;
--
GitLab