AGentooCat/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge of '0df36c67913504a966d734f799d1bb39bf358396'

Browse Source 
and '220f8941ffde39c665c1213cbc27037defb3527f'
This commit is contained in:
zzz
2011-11-26 22:13:07 +00:00
parent f630d2dd27 97ead4cdd6
commit 17773a2de9
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
View File

@@ -147,7 +147,7 @@ abstract class IRCFilter {
* @return the original or modified line, or null if it should be dropped.
*/
public static String outboundFilter(String s, StringBuffer expectedPong, DCCHelper helper) {
String field[]=s.split(" ",3);
String command;
final String[] allowedCommands =
@@ -160,16 +160,30 @@ abstract class IRCFilter {
"WHOIS",
"LIST",
"NAMES",
"ADMIN",
"MOTD",
"PASS",
// "QUIT", // replace with a filtered QUIT to hide client quit messages
"SILENCE",
"MAP", // seems safe enough, the ircd should protect themselves though
// "PART", // replace with filtered PART to hide client part messages
"OPER",
// "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!)
// "PING",
// "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!)
// "PING",
"NICKSERV", "NS", // the next few are default aliases on unreal (+ anope)
"CHANSERV", "CS",
"MEMOSERV", "MS",
"OPERSERV", "OS",
"HELPSERV",
"HOSTSERV", "HS",
"BOTSERV", "BS",
"STATSERV",
"KICK",
"HELPME",
"HELPME", "HELPOP", // helpop is what unrealircd uses by default
// IRCop commands
"ADCHAT", "ADDMOTD", "ADDOMOTD", "CHATOPS", "CHGHOST", "CHGIDENT", "CHGNAME", "DCCDENY", "DIE",
"GLOBOPS", "GZLINE", "KILL", "KLINE", "LOCOPS", "NACHAT", "OPERMOTD", "REHASH", "RESTART", "SAJOIN",
"SAMODE", "SAPART", "SDESC", "SETHOST", "SETIDENT", "SHUN", "SPAMFILTER", "TEMPSHUN", "UNDCCDENY",
"RULES",
"TOPIC",
"ISON", // jIRCii uses this for a ping (response is 303)

12
apps/susidns/src/jsp/index.jsp
View File

@@ -1,9 +1,9 @@
<%
/*
* Created on Sep 02, 2005
*
*
* This file is part of susidns project, see http://susi.i2p/
*
*
* Copyright (C) 2005 <susi23@mail.i2p>
*
* This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*
* $Revision: 1.2 $
*/
@@ -36,14 +36,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title><%=intl._("Introduction")%> - SusiDNS</title>
<link rel="stylesheet" type="text/css" href="css.css">
</head>
<body>
<div class="page">
<div id="logo">
<img src="images/logo.png" alt="susidns logo" border="0"/>
<img src="images/logo.png" alt="susidns logo" border="0">
</div>
<hr>
<div id="navi">
@@ -83,7 +83,7 @@
<%=intl._("The private address book can also be used for aliases of hosts in your other address books.")%>
</p>
<center><img src="images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" /></center>
</div>
</div>
<hr>
<div id="footer">
<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>

9
installer/resources/i2prouter
View File

@@ -131,7 +131,7 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper
# Do not modify anything beyond this point
#-----------------------------------------------------------------------------
if [ -e $WRAPPER_CONF ]; then
if [ ! -e $WRAPPER_CONF ]; then
echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
exit 1
fi
@@ -341,12 +341,7 @@ if [ "$DIST_OS" = "macosx" ]
then
OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
DIST_ARCH="universal"
if [ "$OS_VER" -lt "10.5.0" ]
then
DIST_BITS="32"
else
DIST_BITS="64"
fi
DIST_BITS="64"
APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
APP_PLIST=${APP_PLIST_BASE}.plist
else