Changeset eaa8666


Ignore:
Timestamp:
Feb 4, 2013 11:29:30 AM (7 years ago)
Author:
str4d <str4d@…>
Branches:
master
Children:
e4318e95
Parents:
5a1053e4
Message:

Fixed SOCKS mapping terminology, bumped history

Files:
4 edited

Legend:

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

    r5a1053e4 reaa8666  
    119119        }
    120120
    121         // Check if the requested IP should be mapped to a URL
    122         String mappedUrl = getMappedUrlForIP(connHostName);
    123         if (mappedUrl != null) {
    124             _log.debug("IPV4 address " + connHostName + " was mapped to URL " + mappedUrl);
    125             connHostName = mappedUrl;
     121        // Check if the requested IP should be mapped to a domain name
     122        String mappedDomainName = getMappedDomainNameForIP(connHostName);
     123        if (mappedDomainName != null) {
     124            _log.debug("IPV4 address " + connHostName + " was mapped to domain name " + mappedDomainName);
     125            connHostName = mappedDomainName;
    126126        }
    127127
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

    r5a1053e4 reaa8666  
    207207                }
    208208            }
    209             // Check if the requested IP should be mapped to a URL
    210             String mappedUrl = getMappedUrlForIP(connHostName);
    211             if (mappedUrl != null) {
    212                 _log.debug("IPV4 address " + connHostName + " was mapped to URL " + mappedUrl);
     209            // Check if the requested IP should be mapped to a domain name
     210            String mappedDomainName = getMappedDomainNameForIP(connHostName);
     211            if (mappedDomainName != null) {
     212                _log.debug("IPV4 address " + connHostName + " was mapped to domain name " + mappedDomainName);
    213213                addressType = AddressType.DOMAINNAME;
    214                 connHostName = mappedUrl;
     214                connHostName = mappedDomainName;
    215215            } else if (command != Command.UDP_ASSOCIATE)
    216216                _log.warn("IPV4 address type in request: " + connHostName + ". Is your client secure?");
  • apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java

    r5a1053e4 reaa8666  
    3131
    3232    /**
    33      * IP to I2P URL mapping support. This matches the given IP string against
    34      * a user-set list of mappings. This enables applications which do not
    35      * properly support the SOCKS5 DOMAINNAME feature to be used with I2P.
     33     * IP to domain name mapping support. This matches the given IP string
     34     * against a user-set list of mappings. This enables applications which do
     35     * not properly support the SOCKS5 DOMAINNAME feature to be used with I2P.
    3636     * @param ip The IP address to check.
    37      * @return   The I2P URL if a mapping is found, or null otherwise.
     37     * @return   The domain name if a mapping is found, or null otherwise.
    3838     * @since 0.9.5
    3939     */
    40     protected String getMappedUrlForIP(String ip) {
     40    protected String getMappedDomainNameForIP(String ip) {
    4141        if (props.containsKey(PROP_MAPPING_PREFIX + ip))
    4242            return props.getProperty(PROP_MAPPING_PREFIX + ip);
  • history.txt

    r5a1053e4 reaa8666  
     12013-02-04 str4d
     2 * i2ptunnel:
     3   - IP -> domain name mapping in SOCKS client tunnel:
     4     - Change SOCKS5 addressType on a successful mapping
     5     - Allow any domain name to be mapped, not just .i2p
     6
    172013-01-31 kytv
    28* Add Norwegian Bokmål language to the router console
Note: See TracChangeset for help on using the changeset viewer.