Changeset 3daf287


Ignore:
Timestamp:
May 24, 2013 1:46:17 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
6c62c1f
Parents:
9a4cd117
Message:

GeoIPv6:

  • Handle gzipped input data in merge tool
  • Add script to generate compressed data
  • Add local additions
  • Add compressed data file, generated from Maxmind data fetched 2013-05-24
  • Include data in installer and updater
  • Update Maxmind license info, now CC-SA 3.0
Files:
3 added
4 edited

Legend:

Unmodified
Added
Removed
  • LICENSE.txt

    r9a4cd117 r3daf287  
    208208
    209209       GeoIP Data:
    210        Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
     210       This product includes GeoLite data created by MaxMind, available from http://www.maxmind.com/
    211211       See licenses/LICENSE-GeoIP.txt
    212212
  • build.xml

    r9a4cd117 r3daf287  
    11221122        <copy file="build/addressbook.war" todir="pkg-temp/webapps/" />
    11231123        <!-- decapitalized the file in 0.7.8 -->
    1124        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1124        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
     1125        <!-- small enough to include for now -->
     1126        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11251127    </target>
    11261128
     
    11381140    <target name="prepgeoupdate">
    11391141        <copy file="installer/resources/geoip.txt" todir="pkg-temp/geoip/" />
     1142        <copy file="installer/resources/geoipv6.dat.gz" todir="pkg-temp/geoip/" />
    11401143        <copy file="installer/resources/countries.txt" todir="pkg-temp/geoip/" />
    11411144        <copy todir="pkg-temp/docs/icons/flags" >
  • licenses/LICENSE-GeoIP.txt

    r9a4cd117 r3daf287  
    1 OPEN DATA LICENSE (GeoLite Country and GeoLite City databases)
     1The GeoLite databases are distributed under the
     2Creative Commons Attribution-ShareAlike 3.0 Unported License
     3http://creativecommons.org/licenses/by-sa/3.0/ .
     4The attribution requirement may be met by including the following in
     5all advertising and documentation mentioning features of or use of this database:
    26
    3 Copyright (c) 2008 MaxMind, Inc.  All Rights Reserved.
    4 
    5 All advertising materials and documentation mentioning features or use of
    6 this database must display the following acknowledgment:
    77"This product includes GeoLite data created by MaxMind, available from
    8 http://maxmind.com/"
    9 
    10 Redistribution and use with or without modification, are permitted provided
    11 that the following conditions are met:
    12 1. Redistributions must retain the above copyright notice, this list of
    13 conditions and the following disclaimer in the documentation and/or other
    14 materials provided with the distribution.
    15 2. All advertising materials and documentation mentioning features or use of
    16 this database must display the following acknowledgement:
    17 "This product includes GeoLite data created by MaxMind, available from
    18 http://maxmind.com/"
    19 3. "MaxMind" may not be used to endorse or promote products derived from this
    20 database without specific prior written permission.
    21 
    22 THIS DATABASE IS PROVIDED BY MAXMIND, INC ``AS IS'' AND ANY
    23 EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
    24 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
    25 DISCLAIMED. IN NO EVENT SHALL MAXMIND BE LIABLE FOR ANY
    26 DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
    27 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
    28 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
    29 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
    30 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    31 DATABASE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    32 
     8http://www.maxmind.com/"
  • router/java/src/net/i2p/router/transport/GeoIPv6.java

    r9a4cd117 r3daf287  
    152152            InputStream in = null;
    153153            try {
    154                 in = new FileInputStream(geoFile);
     154                in = new BufferedInputStream(new FileInputStream(geoFile));
     155                if (geoFile.getName().endsWith(".gz"))
     156                    in = new GZIPInputStream(in);
    155157                String buf = null;
    156158                BufferedReader br = new BufferedReader(new InputStreamReader(in, "ISO-8859-1"));
     
    315317    }
    316318
     319    /**
     320     *  Merge and compress CSV files to I2P compressed format
     321     *
     322     *  GeoIP infile1.csv[.gz] [infile2.csv[.gz]...] outfile.dat.gz
     323     *
     324     *  Used to create the file for distribution, do not comment out
     325     */
    317326    public static void main(String args[]) {
    318327        if (args.length < 2) {
Note: See TracChangeset for help on using the changeset viewer.