Changeset a50afeb


Ignore:
Timestamp:
Sep 30, 2014 12:17:56 PM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
fff7fbe
Parents:
49eeb99d
Message:

SAM: Fix v3 LS publish, broken in -4 (ticket #1390)

  • code cleanup in direction handling
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • apps/sam/java/src/net/i2p/sam/SAMv1Handler.java

    r49eeb99d ra50afeb  
    281281                            _log.debug("No DIRECTION parameter in STREAM session, defaulting to BOTH");
    282282                        dir = "BOTH";
    283                     }
    284                     if (!dir.equals("CREATE") && !dir.equals("RECEIVE")
    285                         && !dir.equals("BOTH")) {
     283                    } else if (!dir.equals("CREATE") && !dir.equals("RECEIVE")
     284                               && !dir.equals("BOTH")) {
    286285                        if (_log.shouldLog(Log.DEBUG))
    287286                            _log.debug("Unknown DIRECTION parameter value: [" + dir + "]");
    288287                        return writeString("SESSION STATUS RESULT=I2P_ERROR MESSAGE=\"Unknown DIRECTION parameter\"\n");
     288                    } else {
     289                        props.remove("DIRECTION");
    289290                    }
    290                     props.remove("DIRECTION");
    291291               
    292292                    streamSession = newSAMStreamSession(destKeystream, dir,props);
  • apps/sam/java/src/net/i2p/sam/SAMv3StreamSession.java

    r49eeb99d ra50afeb  
    4949                }
    5050               
    51                    /**
     51           /**
    5252             * Create a new SAM STREAM session, according to information
    5353             * registered with the given nickname
     
    6262                        throws IOException, DataFormatException, SAMException
    6363            {
    64                 super(getDB().get(login).getDest(), "CREATE",
     64                super(getDB().get(login).getDest(), "BOTH",
    6565                      getDB().get(login).getProps(),
    6666                      getDB().get(login).getHandler());
  • history.txt

    r49eeb99d ra50afeb  
     12014-09-30 zzz
     2 * Logs: Fix displayed filename when empty (ticket #1386)
     3 * SAM: Fix v3 LS publish, broken in -4 (ticket #1390)
     4
     52014-09-29 zzz
     6 * CPUID:
     7   - Fix main() model and family calculation
     8   - Add model string fetch from processor
     9   - AMD model string tweaks
     10 * i2psnark: Show subdirectory in table header on details page
     11
    1122014-09-27 zzz
    213 * CPUID:
  • router/java/src/net/i2p/router/RouterVersion.java

    r49eeb99d ra50afeb  
    1919    public final static String ID = "Monotone";
    2020    public final static String VERSION = CoreVersion.VERSION;
    21     public final static long BUILD = 4;
     21    public final static long BUILD = 5;
    2222
    2323    /** for example "-test" */
Note: See TracChangeset for help on using the changeset viewer.