Changeset 17773a2


Ignore:
Timestamp:
Nov 26, 2011 10:13:07 PM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
e4004e6
Parents:
f630d2dd (diff), 97ead4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of '0df36c67913504a966d734f799d1bb39bf358396'

and '220f8941ffde39c665c1213cbc27037defb3527f'

Files:
3 edited

Legend:

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

    rf630d2dd r17773a2  
    148148     */
    149149    public static String outboundFilter(String s, StringBuffer expectedPong, DCCHelper helper) {
    150        
     150
    151151        String field[]=s.split(" ",3);
    152152        String command;
     
    161161                "LIST",
    162162                "NAMES",
     163                "ADMIN",
     164                "MOTD",
    163165                "PASS",
    164166                // "QUIT", // replace with a filtered QUIT to hide client quit messages
     
    167169                // "PART", // replace with filtered PART to hide client part messages
    168170                "OPER",
    169                 // "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!)
    170                 // "PING",
     171                // "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!)
     172                // "PING",
     173                "NICKSERV", "NS", // the next few are default aliases on unreal (+ anope)
     174                "CHANSERV", "CS",
     175                "MEMOSERV", "MS",
     176                "OPERSERV", "OS",
     177                "HELPSERV",
     178                "HOSTSERV", "HS",
     179                "BOTSERV", "BS",
     180                "STATSERV",
    171181                "KICK",
    172                 "HELPME",
     182                "HELPME", "HELPOP",  // helpop is what unrealircd uses by default
     183                // IRCop commands
     184                "ADCHAT", "ADDMOTD", "ADDOMOTD", "CHATOPS", "CHGHOST", "CHGIDENT", "CHGNAME", "DCCDENY", "DIE",
     185                "GLOBOPS", "GZLINE", "KILL", "KLINE", "LOCOPS", "NACHAT", "OPERMOTD", "REHASH", "RESTART", "SAJOIN",
     186                "SAMODE", "SAPART", "SDESC", "SETHOST", "SETIDENT", "SHUN", "SPAMFILTER", "TEMPSHUN", "UNDCCDENY",
    173187                "RULES",
    174188                "TOPIC",
  • apps/susidns/src/jsp/index.jsp

    rf630d2dd r17773a2  
    22/*
    33 * Created on Sep 02, 2005
    4  * 
     4 *
    55 *  This file is part of susidns project, see http://susi.i2p/
    6  * 
     6 *
    77 *  Copyright (C) 2005 <susi23@mail.i2p>
    88 *
     
    2020 *  along with this program; if not, write to the Free Software
    2121 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    22  * 
     22 *
    2323 * $Revision: 1.2 $
    2424 */
     
    3737<html>
    3838<head>
    39 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     39<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
    4040<title><%=intl._("Introduction")%> - SusiDNS</title>
    4141<link rel="stylesheet" type="text/css" href="css.css">
     
    4444<div class="page">
    4545<div id="logo">
    46 <img src="images/logo.png" alt="susidns logo" border="0"/>
     46<img src="images/logo.png" alt="susidns logo" border="0">
    4747</div>
    4848<hr>
     
    8484</p>
    8585<center><img src="images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" /></center>
    86 </div> 
     86</div>
    8787<hr>
    8888<div id="footer">
  • installer/resources/i2prouter

    rf630d2dd r17773a2  
    132132# Do not modify anything beyond this point
    133133#-----------------------------------------------------------------------------
    134 if [ -e $WRAPPER_CONF ]; then
     134if [ ! -e $WRAPPER_CONF ]; then
    135135       echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
    136136       exit 1
     
    342342    OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
    343343    DIST_ARCH="universal"
    344     if [ "$OS_VER" -lt "10.5.0" ]
    345     then
    346         DIST_BITS="32"
    347     else
    348         DIST_BITS="64"
    349     fi
     344    DIST_BITS="64"
    350345    APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
    351346    APP_PLIST=${APP_PLIST_BASE}.plist
Note: See TracChangeset for help on using the changeset viewer.