import of nodogsplash-0.9_beta9.9.6.tar.gz

This commit is contained in:
author
2010-01-10 13:11:00 +01:00
committed by Moritz Warning
parent 58898215e8
commit 6680d435bc
10 changed files with 69 additions and 55 deletions

2
README
View File

@@ -26,7 +26,7 @@ providing, you don't need or want the complexity of user account names and
passwords and maintaining a separate database-backed authentication server.
When installed and running, Nodogsplash implements a simple 'authentication'
protocol. First, it detects any user attempting to use your internet connection
to request a a web page. It captures the request, and instead serves back a
to request a web page. It captures the request, and instead serves back a
'splash' web page using its own builtin web server. The splash page contains a
link which, when the user clicks on it, opens limited access for them to the
internet via your connection, beginning by being redirected to their originally

View File

@@ -49,7 +49,7 @@ maintaining a separate database-backed authentication server.
<p>
When installed and running, Nodogsplash implements a simple 'authentication'
protocol. First, it detects any user attempting to
use your internet connection to request a a web page. It captures
use your internet connection to request a web page. It captures
the request, and instead serves back a 'splash' web page using its own
builtin web server.
The splash page contains a link which, when the user clicks on
@@ -448,7 +448,7 @@ rules in, for example, the mangle table chains, run
iptables -t mangle -v -n -L
</pre>
For extensive suggestions on debugging iptables, see for example
<a href="http://iptables-tutorial.frozentux.net/iptables-tutorial.html">
<a href="http://www.frozentux.net/documents/iptables-tutorial/">
Oskar Andreasson's tutorial</a>.
</li>
</ul>

View File

@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NODOGSPLASH_MAJOR_VERSION=0
NODOGSPLASH_MINOR_VERSION=9_beta9.9.5
NODOGSPLASH_MINOR_VERSION=9_beta9.9.6
NODOGSPLASH_VERSION=$NODOGSPLASH_MAJOR_VERSION.$NODOGSPLASH_MINOR_VERSION

View File

@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NODOGSPLASH_MAJOR_VERSION=0
NODOGSPLASH_MINOR_VERSION=9_beta9.9.5
NODOGSPLASH_MINOR_VERSION=9_beta9.9.6
NODOGSPLASH_VERSION=$NODOGSPLASH_MAJOR_VERSION.$NODOGSPLASH_MINOR_VERSION

View File

@@ -34,8 +34,8 @@
],
{
'm4_pattern_forbid' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'jm_MAINTAINER_MODE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'_AM_SET_OPTION' => 1,
'BB_ENABLE_DOXYGEN' => 1,
'AC_DEFUN' => 1,
@@ -67,8 +67,8 @@
'AM_SET_LEADING_DOT' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
'AM_PROG_INSTALL_SH' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
'AM_MAKE_INCLUDE' => 1
@@ -106,20 +106,20 @@
],
{
'_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
'AM_ENABLE_STATIC' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'm4_pattern_forbid' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_AC_SHELL_INIT' => 1,
'AC_DISABLE_SHARED' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_DEFUN' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'AC_LIBTOOL_SETUP' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AC_LIBTOOL_SETUP' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'AM_PROG_MKDIR_P' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_MISSING_HAS_RUN' => 1,
'AM_MISSING_PROG' => 1,
@@ -130,8 +130,8 @@
'AM_PROG_INSTALL_STRIP' => 1,
'_m4_warn' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'AM_SANITY_CHECK' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
@@ -139,28 +139,28 @@
'AC_LIBTOOL_CXX' => 1,
'LT_AC_PROG_RC' => 1,
'_AM_PROG_TAR' => 1,
'LT_AC_PROG_GCJ' => 1,
'AC_LIBTOOL_GCJ' => 1,
'AM_DISABLE_STATIC' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'LT_AC_PROG_GCJ' => 1,
'AM_DEP_TRACK' => 1,
'AM_CONFIG_HEADER' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AM_DISABLE_STATIC' => 1,
'_AC_PROG_LIBTOOL' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'AM_CONFIG_HEADER' => 1,
'_LT_AC_LANG_F77' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'_AM_IF_OPTION' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'm4_pattern_allow' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_F77' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'm4_pattern_allow' => 1,
'AM_DISABLE_SHARED' => 1,
'AM_SET_LEADING_DOT' => 1,
'AM_PROG_LIBTOOL' => 1,
'_LT_AC_LANG_CXX' => 1,
'AM_PROG_LD' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_PROG_LIBTOOL' => 1,
'_AM_DEPENDENCIES' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_PROG_LD' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'AM_PROG_NM' => 1,
@@ -169,18 +169,18 @@
'AC_LIBTOOL_DLOPEN' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'AC_PROG_LD' => 1,
'AC_PROG_LD_GNU' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'AC_PROG_LD_GNU' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'jm_MAINTAINER_MODE' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'_AM_SET_OPTION' => 1,
'BB_ENABLE_DOXYGEN' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_DISABLE_STATIC' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
@@ -190,39 +190,39 @@
'_LT_AC_LANG_RC_CONFIG' => 1,
'_LT_AC_LANG_GCJ' => 1,
'AC_LIBTOOL_RC' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'include' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'include' => 1,
'LT_AC_PROG_SED' => 1,
'AM_ENABLE_SHARED' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'AC_ENABLE_SHARED' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'_AM_SET_OPTIONS' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_RUN_LOG' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'AC_CHECK_LIBM' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_ENABLE_STATIC' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'AC_CHECK_LIBM' => 1,
'_LT_AC_TAGVAR' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_AM_MANGLE_OPTION' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AM_CONDITIONAL' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'AM_SET_DEPDIR' => 1,
'm4_include' => 1,
'AM_PROG_INSTALL_SH' => 1,
'_LT_CC_BASENAME' => 1,
'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
'AC_PROG_EGREP' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_PATH_MAGIC' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AM_MAKE_INCLUDE' => 1
}
], 'Autom4te::Request' ),
@@ -238,15 +238,15 @@
'configure.in'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'AC_INIT' => 1,
'_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
'AC_INIT' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
'AC_SUBST' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_FC_SRCEXT' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
@@ -254,8 +254,8 @@
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'm4_sinclude' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
@@ -272,11 +272,11 @@
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'm4_pattern_allow' => 1,
'sinclude' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,

2
configure vendored
View File

@@ -3259,7 +3259,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
NODOGSPLASH_MAJOR_VERSION=0
NODOGSPLASH_MINOR_VERSION=9_beta9.9.5
NODOGSPLASH_MINOR_VERSION=9_beta9.9.6
NODOGSPLASH_VERSION=$NODOGSPLASH_MAJOR_VERSION.$NODOGSPLASH_MINOR_VERSION

View File

@@ -19,7 +19,7 @@ AC_PROG_CXX
AC_SUBST(BUILDROOT)
NODOGSPLASH_MAJOR_VERSION=0
NODOGSPLASH_MINOR_VERSION=9_beta9.9.5
NODOGSPLASH_MINOR_VERSION=9_beta9.9.6
NODOGSPLASH_VERSION=$NODOGSPLASH_MAJOR_VERSION.$NODOGSPLASH_MINOR_VERSION
AC_SUBST(NODOGSPLASH_MAJOR_VERSION)

View File

@@ -23,6 +23,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <sys/types.h>
#if defined(_WIN32)
#else

View File

@@ -668,7 +668,10 @@ int _httpd_sendDirectoryEntry(httpd *server, request *r, httpContent *entry,
char *entryName)
{
char path[HTTP_MAX_URL];
/* We do not want to serve directory entry directly. (Mitar) */
if (entryName[0] == '\0') {
return(-1);
}
snprintf(path, HTTP_MAX_URL, "%s/%s", entry->path, entryName);
_httpd_sendFile(server, r, path);
return(0);

View File

@@ -154,6 +154,7 @@ iptables_do_command(char *format, ...) {
char *fmt_cmd,
*cmd;
int rc;
int i;
va_start(vlist, format);
safe_vasprintf(&fmt_cmd, format, vlist);
@@ -165,7 +166,16 @@ iptables_do_command(char *format, ...) {
debug(LOG_DEBUG, "Executing command: %s", cmd);
rc = execute(cmd, fw_quiet);
for (i = 0; i < 5; i++) {
rc = execute(cmd, fw_quiet);
if (rc == 4) {
/* iptables error code 4 indicates a resource problem that might
* be temporary. So we retry to insert the rule a few times. (Mitar) */
sleep(1);
} else {
break;
}
}
if(!fw_quiet && rc != 0) {
debug(LOG_ERR, "Nonzero exit status %d from command: %s", rc, cmd);
}