I2P Address: [http://git.idk.i2p]

Skip to content
Snippets Groups Projects
Commit 17773a2d authored by zzz's avatar zzz
Browse files

merge of '0df36c67913504a966d734f799d1bb39bf358396' 

     and '220f8941ffde39c665c1213cbc27037defb3527f'
parents f630d2dd 97ead4cd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/irc/IRCFilter.java
+ 18
− 4
View file @ 17773a2d
...@@ -147,7 +147,7 @@ abstract class IRCFilter { ...@@ -147,7 +147,7 @@ abstract class IRCFilter {
* @return the original or modified line, or null if it should be dropped. * @return the original or modified line, or null if it should be dropped.
*/ */
public static String outboundFilter(String s, StringBuffer expectedPong, DCCHelper helper) { public static String outboundFilter(String s, StringBuffer expectedPong, DCCHelper helper) {
String field[]=s.split(" ",3); String field[]=s.split(" ",3);
String command; String command;
final String[] allowedCommands = final String[] allowedCommands =
...@@ -160,16 +160,30 @@ abstract class IRCFilter { ...@@ -160,16 +160,30 @@ abstract class IRCFilter {
"WHOIS", "WHOIS",
"LIST", "LIST",
"NAMES", "NAMES",
"ADMIN",
"MOTD",
"PASS", "PASS",
// "QUIT", // replace with a filtered QUIT to hide client quit messages // "QUIT", // replace with a filtered QUIT to hide client quit messages
"SILENCE", "SILENCE",
"MAP", // seems safe enough, the ircd should protect themselves though "MAP", // seems safe enough, the ircd should protect themselves though
// "PART", // replace with filtered PART to hide client part messages // "PART", // replace with filtered PART to hide client part messages
"OPER", "OPER",
// "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!) // "PONG", // replaced with a filtered PING/PONG since some clients send the server IP (thanks aardvax!)
// "PING", // "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", "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", "RULES",
"TOPIC", "TOPIC",
"ISON", // jIRCii uses this for a ping (response is 303) "ISON", // jIRCii uses this for a ping (response is 303)
......
apps/susidns/src/jsp/index.jsp
+ 6
− 6
View file @ 17773a2d
<% <%
/* /*
* Created on Sep 02, 2005 * Created on Sep 02, 2005
* *
* This file is part of susidns project, see http://susi.i2p/ * This file is part of susidns project, see http://susi.i2p/
* *
* Copyright (C) 2005 <susi23@mail.i2p> * Copyright (C) 2005 <susi23@mail.i2p>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* *
* $Revision: 1.2 $ * $Revision: 1.2 $
*/ */
...@@ -36,14 +36,14 @@ ...@@ -36,14 +36,14 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html> <html>
<head> <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> <title><%=intl._("Introduction")%> - SusiDNS</title>
<link rel="stylesheet" type="text/css" href="css.css"> <link rel="stylesheet" type="text/css" href="css.css">
</head> </head>
<body> <body>
<div class="page"> <div class="page">
<div id="logo"> <div id="logo">
<img src="images/logo.png" alt="susidns logo" border="0"/> <img src="images/logo.png" alt="susidns logo" border="0">
</div> </div>
<hr> <hr>
<div id="navi"> <div id="navi">
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<%=intl._("The private address book can also be used for aliases of hosts in your other address books.")%> <%=intl._("The private address book can also be used for aliases of hosts in your other address books.")%>
</p> </p>
<center><img src="images/how.png" border="0" alt="address book working scheme" title="How the address book works" class="illustrate" /></center> <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> <hr>
<div id="footer"> <div id="footer">
<p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p> <p class="footer">susidns v${version.version} &copy; <a href="${version.url}">susi</a> 2005</p>
......
installer/resources/i2prouter
+ 2
− 7
View file @ 17773a2d
...@@ -131,7 +131,7 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper ...@@ -131,7 +131,7 @@ PLIST_DOMAIN=org.tanukisoftware.wrapper
# Do not modify anything beyond this point # 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" echo "Starting I2P Failed: Unable to find $WRAPPER_CONF"
exit 1 exit 1
fi fi
...@@ -341,12 +341,7 @@ if [ "$DIST_OS" = "macosx" ] ...@@ -341,12 +341,7 @@ if [ "$DIST_OS" = "macosx" ]
then then
OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'` OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*'`
DIST_ARCH="universal" DIST_ARCH="universal"
if [ "$OS_VER" -lt "10.5.0" ] DIST_BITS="64"
then
DIST_BITS="32"
else
DIST_BITS="64"
fi
APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME} APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
APP_PLIST=${APP_PLIST_BASE}.plist APP_PLIST=${APP_PLIST_BASE}.plist
else else
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Base32 Address: [http://7qeve4v2chmjdqlwpa3vl7aojf3nodbku7vepnjwrsxljzqipz6a.b32.i2p] Onion Address: [http://47ggr2fa3vnwfyhvgskzdmr3i32eijwymxohtxsls45dulmriwxszjad.onion]