I2P_Developers/i2p.itoopie
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

propagate from branch 'i2p.i2p' (head 81ec1b16687e7276a752db7f600a525a6e289458)

Browse Source 
to branch 'i2p.i2p.sam3' (head bf43c21d57d97df61e863a41783aaae968381d00)
This commit is contained in:
mkvore-commit
2009-04-21 04:15:32 +00:00
parent 0f1f33eaa4 eae4362181
commit 7cdfe45acf
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/sam/java/src/net/i2p/sam/SAMv1Handler.java
View File

@ -42,8 +42,9 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
protected SAMRawSession rawSession = null; protected SAMRawSession rawSession = null;
protected SAMDatagramSession datagramSession = null; protected SAMDatagramSession datagramSession = null;
protected SAMStreamSession streamSession = null; protected SAMStreamSession streamSession = null;
protected SAMDatagramSession getDatagramSession() {return datagramSession ;}
protected SAMRawSession getRawSession() {return rawSession ;} protected SAMRawSession getRawSession() {return rawSession ;}
protected SAMDatagramSession getDatagramSession() {return datagramSession ;}
protected SAMStreamSession getStreamSession() {return streamSession ;}
protected long _id; protected long _id;
protected static volatile long __id = 0; protected static volatile long __id = 0;
@ -331,8 +332,8 @@ public class SAMv1Handler extends SAMHandler implements SAMRawReceiver, SAMDatag
if (name.equals("ME")) { if (name.equals("ME")) {
if (getRawSession() != null) { if (getRawSession() != null) {
dest = getRawSession().getDestination(); dest = getRawSession().getDestination();
} else if (streamSession != null) { } else if (getStreamSession() != null) {
dest = streamSession.getDestination(); dest = getStreamSession().getDestination();
} else if (getDatagramSession() != null) { } else if (getDatagramSession() != null) {
dest = getDatagramSession().getDestination(); dest = getDatagramSession().getDestination();
} else { } else {

12
apps/sam/java/src/net/i2p/sam/SAMv3Handler.java
View File

@ -44,17 +44,19 @@ public class SAMv3Handler extends SAMv1Handler
{ {
private final static Log _log = new Log ( SAMv3Handler.class ); private final static Log _log = new Log ( SAMv3Handler.class );
protected SAMv3StreamSession streamSession = null ;
protected SAMv3RawSession rawSession = null ; protected SAMv3RawSession rawSession = null ;
protected SAMv3DatagramSession datagramSession = null ; protected SAMv3DatagramSession datagramSession = null ;
protected SAMv3StreamSession streamSession = null ;
protected SAMDatagramSession getDatagramSession() {
return datagramSession ;
}
protected SAMRawSession getRawSession() { protected SAMRawSession getRawSession() {
return rawSession ; return rawSession ;
} }
protected SAMDatagramSession getDatagramSession() {
return datagramSession ;
}
protected SAMStreamSession getStreamSession() {
return streamSession ;
}
protected Session session = null ; protected Session session = null ;