Changeset f34a05c


Ignore:
Timestamp:
Feb 25, 2016 1:52:00 PM (6 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
d9a7dc0
Parents:
8e4b7e3
Message:

i2ptunnel: Fix default shouldBundleReplyInfo setting for non-http servers

Location:
apps/i2ptunnel/java/src/net/i2p/i2ptunnel
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

    r8e4b7e3 rf34a05c  
    8080
    8181    private static final String OPT_PERSISTENT = PFX_OPTION + "persistentClientKey";
    82     private static final String OPT_BUNDLE_REPLY = PFX_OPTION + "shouldBundleReplyInfo";
     82    public static final String OPT_BUNDLE_REPLY = PFX_OPTION + "shouldBundleReplyInfo";
    8383    private static final String OPT_TAGS_SEND = PFX_OPTION + "crypto.tagsToSend";
    8484    private static final String OPT_LOW_TAGS = PFX_OPTION + "crypto.lowTagThreshold";
     
    653653                if (!_config.containsKey(OPT_BUNDLE_REPLY))
    654654                    _config.setProperty(OPT_BUNDLE_REPLY, "false");
    655             } else if (type.contains("irc") || type.equals(TYPE_STREAMR_CLIENT)) {
     655            } else if (!isClient(type)) {
     656                // override UI that sets it to false
     657                _config.setProperty(OPT_BUNDLE_REPLY, "true");
     658            }
     659            if (type.contains("irc") || type.equals(TYPE_STREAMR_CLIENT)) {
    656660                // maybe a bad idea for ircclient if DCC is enabled
    657661                if (!_config.containsKey(OPT_TAGS_SEND))
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java

    r8e4b7e3 rf34a05c  
    559559                    config.setProperty(OPT + p, _otherOptions.get(p));
    560560            }
     561        }
     562
     563        // override bundle setting set above
     564        if (!TunnelController.isClient(_type) &&
     565            !TunnelController.TYPE_HTTP_SERVER.equals(_type) &&
     566            !TunnelController.TYPE_STREAMR_SERVER.equals(_type)) {
     567            config.setProperty(TunnelController.OPT_BUNDLE_REPLY, "true");
    561568        }
    562569
Note: See TracChangeset for help on using the changeset viewer.