You can subscribe to this list here.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(19) |
Nov
(34) |
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(3) |
Feb
(1) |
Mar
(4) |
Apr
(31) |
May
(15) |
Jun
(33) |
Jul
(3) |
Aug
(7) |
Sep
(2) |
Oct
(7) |
Nov
(2) |
Dec
|
2005 |
Jan
|
Feb
(7) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2008 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(13) |
Oct
|
Nov
|
Dec
|
2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(1) |
Aug
|
Sep
(2) |
Oct
|
Nov
(3) |
Dec
|
2015 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Sergey M. <sm...@us...> - 2015-03-04 21:58:20
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15485/ipac-ng/agents/iptables Modified Files: iptables.c Log Message: Fixed compatibility with iptables up to 1.4.21 Index: iptables.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- iptables.c 25 Sep 2011 23:12:24 -0000 1.10 +++ iptables.c 4 Mar 2015 21:58:18 -0000 1.11 @@ -73,6 +73,11 @@ #define IPT_ALIGN XT_ALIGN #endif +enum { + XT_OPTION_OFFSET_SCALE = 256, +}; + + static struct option original_opts[] = { {.name = "append", .has_arg = 1, .val = 'A'}, {.name = "delete", .has_arg = 1, .val = 'D'}, @@ -990,8 +995,12 @@ if (m->init != NULL) m->init(m->m); #if XTABLES_VERSION_CODE > 5 - opts = xtables_merge_options(iptables_globals.orig_opts, - opts, m->extra_opts, &m->option_offset); + if (m->x6_options != NULL) + opts = xtables_options_xfrm(iptables_globals.orig_opts, opts, + m->x6_options, &m->option_offset); + else if (m->extra_opts != NULL) + opts = xtables_merge_options(iptables_globals.orig_opts, opts, + m->extra_opts, &m->option_offset); #else opts = xtables_merge_options(opts, m->extra_opts, &m->option_offset); @@ -1010,27 +1019,29 @@ printf("Bad argument `%s'\n", optarg); exit(1); - default: - for (matchp = matches; matchp; matchp = matchp->next) { - if (matchp->completed) - continue; - if (matchp->match->parse(c - matchp->match->option_offset, - d->extension, invert, - &matchp->match->mflags, - &fw, - &matchp->match->m)) + default: + for (matchp = matches; matchp; matchp = matchp->next) { + m = matchp->match; + + if (matchp->completed || + (m->x6_parse == NULL && m->parse == NULL)) + continue; + if (c < matchp->match->option_offset || + c >= matchp->match->option_offset + XT_OPTION_OFFSET_SCALE) + continue; + xtables_option_mpcall(c, d->extension, invert, m, &fw); break; - } - break; + } + break; } } } for (matchp = matches; matchp; matchp = matchp->next) - if (matchp->match->final_check != NULL) - matchp->match->final_check(matchp->match->mflags); - - if (target != NULL && target->final_check != NULL) - target->final_check(target->tflags); + xtables_option_mfcall(matchp->match); + + if (target != NULL) + xtables_option_tfcall(target); + *e = generate_entry(&fw, matches, target->t); if (!handle) if (!(handle = iptc_init("filter"))) |
From: Sergey M. <sm...@us...> - 2011-11-13 01:30:26
|
Update of /cvsroot/ipac-ng/ipac-ng/access/files In directory vz-cvs-4.sog:/tmp/cvs-serv7764/ipac-ng/access/files Modified Files: rules.l Log Message: fixed eth+ notation in rules file Index: rules.l =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/access/files/rules.l,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- rules.l 27 Jun 2004 19:15:45 -0000 1.2 +++ rules.l 13 Nov 2011 01:30:24 -0000 1.3 @@ -1,6 +1,12 @@ %option stack %option noyywrap %option caseless 8bit +%option nodefault +%option yylineno +%option nounput +%option noinput +%option noyy_top_state + %x chain intf sou des ext proto iplist %{ @@ -20,7 +26,7 @@ %% <*>#[^\n]*[\n]? /* eat comments */ -<INITIAL,chain,sou,des,intf>[ \t]+ ; +<INITIAL,chain,sou,des>[ \t]+ ; <INITIAL>{ACHAR}+ { ruleslval.s = (char *) xstrdup(yytext); return RNAME; @@ -53,11 +59,15 @@ yy_switch_to_buffer(old_st); yy_pop_state(); } -<ext>[[:alnum:]\.\-\_\/\~:\!\,]+ { +<ext>[[:alnum:]\.\-\_\/\~:\!\,]+ { ruleslval.s = (char *) xstrdup(yytext); return WORD; } -<proto,intf,sou,des>[[:alnum:]\.\-\_\/\~]+ { +<proto,sou,des>[[:alnum:]\.\-\_\/\~]+ { + ruleslval.s = (char *) xstrdup(yytext); + return WORD; + } +<intf>([[:graph:]]{-}[\|\/])+ { ruleslval.s = (char *) xstrdup(yytext); return WORD; } @@ -73,4 +83,12 @@ <INITIAL>\| BEGIN(chain); return SEP; <INITIAL>[\n]+ ; <<EOF>> yyterminate(); +<*>. { + printf("Invalid character '%s' at line %d in rules file.\n", yytext, yylineno); + exit(1); + } +<*>\n { + printf("Unexpected end-of-line at line %d in rules file.\n", yylineno); + exit(1); + } %% |
From: Sergey M. <sm...@us...> - 2011-11-05 01:26:01
|
Update of /cvsroot/ipac-ng/ipac-ng In directory vz-cvs-4.sog:/tmp/cvs-serv17870/ipac-ng Modified Files: CHANGELOG README TODO Log Message: Updated documentation to v.1.34.2 Index: README =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/README,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- README 17 Jul 2011 03:45:22 -0000 1.6 +++ README 5 Nov 2011 01:25:58 -0000 1.7 @@ -6,7 +6,6 @@ For copyright notice see at the bottom of this file - WHAT IS IT? ipac is a package which is designed to gather, summarize and nicely @@ -18,11 +17,10 @@ - runs on top of the iptables or ipchains tool - needs certain kernel parts compiled in - NOTE FOR THAT WHO TRY TO USE THIS FOR THE FIRST TIME -2.2.* kernels support is not well, please use 2.4+iptables. All features -tested & work only for 2.4. But in case you need simple accounting only 2.2 -is enough. +2.2.* kernels support is not well, please use 2.4-3.0 + iptables. All features +tested & work only for 2.4-3.0 kernels. But in case you need simple accounting +only 2.2 is enough. HOW DOES IT WORK? @@ -50,7 +48,7 @@ INSTALLATION / PRECONDITIONS ipac-ng runs at least under Linux kernel 2.2.11, 2.2.16 - 2.2.19, 2.4.1, 2.4.3, -2.4.[4-13]. It should run on any kernel above. +2.4.[4-13]. It should run on any kernel above including 2.6.X and 3.0.X. You need perl 5. @@ -72,6 +70,7 @@ cgi scripts uses DBI, DBI-pg and CGI perl modules. They can be found at cpan http://www.cpan.org/CPAN.html. + PRECONDITIONS FOR 2.1.* and 2.2.* kernels At first, you'll need an ipchains tool. @@ -88,28 +87,33 @@ * filter, read the fetchipac man page, section BUGS! -PRECONDITIONS FOR 2.4.* and 2.6.* kernels +PRECONDITIONS FOR 2.4.*, 2.6.* and 3.0.* kernels -You'll need an iptables tool. Don't even try to use ipchains with 2.4.* +You'll need an iptables tool. Don't even try to use ipchains with these kernels. There is a bug that don't allow correct counters zeroing. You need a kernel which was compiled with the configuration option "Network packet filtering (replaces ipchains)" set to "y" or "m". Also "IP tables support" and "Packet filtering" must be set to "y" or "m". -NOTE: ipac-ng 1.34 works with iptables 1.4.3 and higher (confirmed up to 1.4.11.1); +NOTE: ipac-ng 1.34.2 works with iptables 1.4.3 and higher (confirmed up to + 1.4.12.1); ipac-ng 1.33 works with iptables 1.4.2; ipac-ng 1.32 and lower work with iptables 1.2.X and 1.3.X. -ipac-ng 1.34 uses iptables shared libraries, so these libraries must exist -in your system (i.e. iptables must be compiled with option which produces -these libraries: libxtables.so and libiptc.so or libip4tc.so). If your system -doesn't provide iptables shared libraries you can build ipac-ng with iptables -source code. See BUILD-with-iptables-source file in doc subdirectory for -instructions how to do it. +ipac-ng since v.1.34 uses iptables shared libraries, so these libraries +must exist in your system (i.e. iptables must not be compiled with an option +which excludes production of these libraries: libxtables.so and libiptc.so +or libip4tc.so). -To compile ipac-ng 1.34 you will additionally need iptables headers. +If your system doesn't provide iptables shared libraries you can build +ipac-ng statically with iptables source code. See BUILD-with-iptables-source +file in doc subdirectory for instructions how to do it. + +To compile ipac-ng 1.34 and later you will need iptables headers. Please install iptables-dev package - it provides these headers. +You don't need these headers if you are compiling ipac-ng statically with +iptables source code. NOTE: ipac-ng 1.33 and higher (especially fetchipac program) must be used with the same version of iptables which it was compiled with, @@ -117,6 +121,7 @@ but to be on the safe side, you should avoid version mixing. Always recompile/reinstall ipac-ng after iptables uprgades/downgrades! + INSTALLATION / OVERVIEW To install: @@ -135,7 +140,7 @@ - As root, run 'make install'. - - Create the file '/etc/ipac-ng/ipac.conf'. + - Create the files '/etc/ipac-ng/ipac.conf' and '/etc/ipac-ng/rules.conf'. - Run 'fetchipac -S'. @@ -163,32 +168,57 @@ where Name of rule Any string to identify this rule direction 'in' or 'out' - interface ip number or interface name or empty + interface interface name or '+' or empty protocol 'tcp' or 'udp' or 'icmp' or 'all' source \ - destination both as described in ipfwadm(8), or empty + destination both as described below, or empty In the summaries, the 'Name of rule' string identifies the counter. -Both the source and destination must be in ipfwadm/ipchains syntax - -consult the man page. -The interface can be named (for example, eth0) or its IP number can be given. -Linux IP accounting always counts at one interface or at any interface. The -direction means in or out of this interface. +The syntax of both the source and destination must be following: + + address[/mask] [port ...] + +Address can be either a hostname, a network name, or a plain IP address. +The mask can be either a network mask or a plain number, specifying the +number of 1's at the left side of the network mask (CIDR notation). Thus, +a mask of 24 is equivalent with 255.255.255.0. + +Note, that if hostname is specified as source/destination address, the +name resolution occurs at the moment when fetchipac -S invoked, i.e. +when ip accounting is initialized. The case if hostname resolves in +multiple IP addresses currently not supported. + +The source/destination may include one or more port specifications or +ICMP types. Each of them can either be a servicename, a port number, or +a (numeric) ICMP type. + +Note that the specified protocol may imply restrictions on the ports to +be specified. Ports may only be specified in combination with the tcp, +udp, or icmp protocol. When this option is omitted, the default +address/mask 0.0.0.0/0 (matching with any address) is used as +source/destination address. + +The interface can be named (for example, eth0). Empty field or '+' both +mean 'any interface'. Linux IP accounting always counts at one interface +or at any interface. The direction means in or out of this interface. + +You can have several lines with the same name of the rule. This means +that these lines will share one counter, i.e. results will be summarized. * You must run the fetchipac -S after changing the -* ipac.conf file every time for the changes to take effect! +* rules or ipac.conf file every time for the changes to take effect! An example ipac.conf and ipac.rules files come with the distribution. Since of version 1.09 of ipac-ng there are some improvements done: 1) you may define user-defined accounting chains for the sake of speed; 2) you may use network file in source *or* destination for the sake of - configurability; - + configurability. USER DEFINED CHAINS + Imagine that you have to account traffic for few hundreds of users, ok prior to version 1.09 you'l end up with some thousands of rules in plain format. And each packet will travel throught all of that rules. This will lead to major @@ -206,8 +236,8 @@ and so on.. - HOW TO DEFINE USER CHAINS + First, get a look at example ipac.conf. Still questions? ok.. Since of 1.09 there is a special tag in 'Name of rule' field of config. It's, as you can see, '%chain% '. Config file parser meeting this tag make decision not to create new @@ -230,7 +260,6 @@ Still questions? Welcome to email! kai...@ma.... - INSTALLATION / FETCHING ACCOUNTING DATA FROM KERNEL: FETCHIPAC IN CRON In order to collect the accounting data, you must put a line into a @@ -243,7 +272,6 @@ */5 * * * * root /usr/local/sbin/fetchipac - INSTALLATION / AFTER REBOOTS Naturally, the kernel forgets about the ip accounting on reboots. @@ -254,6 +282,16 @@ # Switch on ip accounting /usr/local/sbin/fetchipac -S +Hint: This crontab entry will call fetchipac -S if ip accounting is not + initialized (or destroyed by another program) or call fetchipac + without switches otherwise. Unwrap the line below, it is wrapped + for readability. + +*/10 * * * * root (test -f /etc/ipac-ng/ipac.conf && test -f + /usr/local/sbin/fetchipac && test -d /var/lib/ipac/ && + /usr/bin/nice /usr/local/sbin/fetchipac 2>&1 | + /bin/grep -q corrupted && /usr/bin/nice + /usr/local/sbin/fetchipac -S) || [ $? -eq 1 ] READING IP ACCOUNTING SUMMARIES @@ -275,7 +313,6 @@ A small help screen will be displayed with ipacsum --help. - CLEANING UP fetchipac generates a single database record every time it runs. @@ -322,14 +359,11 @@ 4 0 1 2 * root /usr/local/bin/ipacsum -r -t "the year 2 years ago" >/dev/null - - FURTHER DOCUMENTATION Read the man pages - ipacsum(8) and fetchipac(8). - CONTRIBUTIONS The directory contrib/ contains stuff that does not directly belong to Index: TODO =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/TODO,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- TODO 28 Jun 2004 15:47:24 -0000 1.7 +++ TODO 5 Nov 2011 01:25:58 -0000 1.8 @@ -23,7 +23,8 @@ - create documentation document with plain-file storage method description -Things to do for ipac-ng 1.31: +- implement support for ipv6 -- add support for MySQL database backend +- create frontend GUI application +- create RPM/DEB packages for most popular Linux distributions Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- CHANGELOG 17 Jul 2011 03:45:22 -0000 1.37 +++ CHANGELOG 5 Nov 2011 01:25:58 -0000 1.38 @@ -12,7 +12,7 @@ # kaiser13/az ......... Al Zakharov <kaiser13 at users dot sourceforge dot net> # friedl/fl ........... Friedrich Lobenstock <fl at fl dot priv dot at> # mpoos ............... Mark Spieth <mpoos at users dot sourceforge dot net> -# sm ...................Sergey Merzlikin <smsoft at sm dot smsoft dot ru> +# sm ...................Sergey Merzlikin <sm at smsoft dot ru> # # contributors: # Thomas Zehetbauer <thomasz at hostmaster dot org> @@ -33,6 +33,18 @@ * with storage backend "gdbm" DO NOT call fetchipac twice in the same second or your database will be destroyed - no fix, other than removing support for gdbm, yet + * incorrect parsing of port ranges (port:port) in rules file. + * if source/destination in rules file is specified as hostname, + and this hostname resolves to multiple ip addresses, the rule + is not accepted. + * error message doesn't contain rule name if rule parsing error occurs + +1.34.2 +- fixed incompatibility with iptables 1.4.11 - 1.4.12.1 (sm) +- improved configure/build scripts. Now both dynamic (with iptables dynamic + libraries) and static (with iptables source) compilation is compatible + with iptables 1.4.3 - 1.4.12.1 (sm) +- updated documentation (sm) 1.34.1 - fixed incompatibility with some linux distributions which use iptables 1.4.10 |
From: Sergey M. <sm...@us...> - 2011-11-04 19:14:42
|
Update of /cvsroot/ipac-ng/ipac-ng In directory vz-cvs-4.sog:/tmp/cvs-serv10045/ipac-ng Modified Files: config.h.in configure configure.in Log Message: Improved configure/make scripts Index: config.h.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/config.h.in,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- config.h.in 12 Sep 2010 11:59:20 -0000 1.5 +++ config.h.in 4 Nov 2011 19:14:39 -0000 1.6 @@ -71,3 +71,10 @@ /* database definitions */ #define DBASE x #define DBASE_PORT NULL + +/* Define to 1 if you have the <linux/magic.h> header file. */ +#undef HAVE_LINUX_MAGIC_H + +/* Define to 1 if you have the <linux/proc_fs.h> header file. */ +#undef HAVE_LINUX_PROC_FS_H + Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- configure 25 Sep 2011 23:21:09 -0000 1.20 +++ configure 4 Nov 2011 19:14:39 -0000 1.21 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67. +# Generated by GNU Autoconf 2.68. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -89,6 +89,7 @@ IFS=" "" $as_nl" # Find who we are. Look in the path if we contain no directory separator. [...1463 lines suppressed...] + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" + } >"$ac_tmp/config.h" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 - if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then + if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" - mv "$tmp/config.h" "$ac_file" \ + mv "$ac_tmp/config.h" "$ac_file" \ || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ - && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ + && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \ || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- configure.in 25 Sep 2011 23:21:09 -0000 1.20 +++ configure.in 4 Nov 2011 19:14:39 -0000 1.21 @@ -375,19 +375,22 @@ dnl ----- decisions about accounting agents dnl ----------------------------------- AC_MSG_CHECKING([for available accounting agents]) -ACCAGENTS=`(cd agents && find . -type d -print) | +ACCAGENTS0=`(cd agents && find . -type d -print) | sed -e 's#^\./##' | egrep -v '\.|CVS|iptables/libiptc' | tr '\n' ' '` -dnl AC_SUBST(ACCAGENTS) accagent_makefiles="" ACCAGENTSLIBRARYS="" -for ag in $ACCAGENTS; do - accagent_makefiles="$accagent_makefiles agents/$ag/Makefile" - ACCAGENTSLIBRARYS="$ACCAGENTSLIBRARYS agents/$ag/libipac$ag.a" - LIBS="$LIBS -Lagents/$ag -lipac$ag" - dnl check if the accounting agents requires any libraries. - ADDLIBS=`grep 'NEEDLIBS=' agents/$ag/Makefile.in | \ +ACCAGENTS="" +for ag in $ACCAGENTS0; do + if test -f "agents/$ag/Makefile.in"; then + ACCAGENTS="$ACCAGENTS $ag" + accagent_makefiles="$accagent_makefiles agents/$ag/Makefile" + ACCAGENTSLIBRARYS="$ACCAGENTSLIBRARYS agents/$ag/libipac$ag.a" + LIBS="$LIBS -Lagents/$ag -lipac$ag" + dnl check if the accounting agents requires any libraries. + ADDLIBS=`grep 'NEEDLIBS=' agents/$ag/Makefile.in | \ sed -e 's/^# *NEEDLIBS=//' -e 's/ *$//'` - test -n "$ADDLIBS" && LIBS="$LIBS $ADDLIBS" + test -n "$ADDLIBS" && LIBS="$LIBS $ADDLIBS" + fi done AC_SUBST(ACCAGENTS) AC_MSG_RESULT($ACCAGENTS) @@ -485,9 +488,7 @@ elif test -f /proc/net/ip_tables_names; then test -z "$IPTABLES" && AC_MSG_WARN([required program iptables not there]) else - AC_MSG_WARN([firewall module missing in kernel] - [Recompile the kernel with CONFIG_IP_FIREWALL] - [or CONFIG_IP_ACCT]) + AC_MSG_WARN([firewall module missing in kernel]) fi fi @@ -509,34 +510,89 @@ AC_MSG_WARN([iptables library directory not found, define ] [it at config.h]) fi - AC_CHECK_HEADERS(xtables.h, [], [AC_MSG_ERROR([xtables.h not found. Install iptables-dev package.])]) - AC_CHECK_HEADERS(libiptc/libiptc.h, [], [AC_MSG_ERROR([libiptc.h not found. Install iptables-dev package.])]) + IPTSLIBS="" + IPTSINC="" + IPTSSRC="" + IPTDOBEFORECC="" + IPTDOAFTERCC="" if test x$IPTABLES_SRC = x; then + AC_CHECK_HEADERS(xtables.h, [], [AC_MSG_ERROR([xtables.h not found. Install iptables-dev package.])]) + AC_CHECK_HEADERS(libiptc/libiptc.h, [], [AC_MSG_ERROR([libiptc.h not found. Install iptables-dev package.])]) save_libs=$LIBS LIBS="" AC_SEARCH_LIBS([xtables_init], [xtables], [], [AC_MSG_ERROR([libxtables not found. Install iptables with shared libraries support.])]) - save_libs="$LIBS $save_libs" + save_libs="$save_libs $LIBS" LIBS="" - AC_SEARCH_LIBS([iptc_init], [iptc ip4tc], [], [AC_MSG_ERROR([libiptc/libip4tc not found. Install iptables with shared libraries support.])]) - LIBS="$LIBS $save_libs" + AC_SEARCH_LIBS([iptc_init], [iptc ip4tc], [], [AC_MSG_ERROR([libiptc or libip4tc not found. Install iptables with shared libraries support.])]) + LIBS="$save_libs $LIBS" else - IPTSRCFILES="xtables.c libiptc/libiptc.c libiptc/libip4tc.c libiptc/linux_list.h libiptc/linux_stddef.h" - for iptsrcfile in $IPTSRCFILES; do - AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, $iptsrcfile) + IPTSINC="-I'$IPTABLES_SRC/include'" + dnl Search for iptables source file + dnl $1 - source file name + dnl $2 - source file name with subdir in iptables source tree + dnl $3 - result .o file name + dnl $4 - additional actions if found + dnl $5 - additional actions if not found + AC_DEFUN([IPAC_SEARCH_IPTABLES_SRCFILE], + iptsrcfiledest=$PWD/agents/iptables/$1 + AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, $2) + AC_CHECK_FILE($iptsrcfileabs, [ + IPTDOBEFORECC="$IPTDOBEFORECC ln -s -f -T '$iptsrcfileabs' '$iptsrcfiledest';" + IPTDOAFTERCC="$IPTDOAFTERCC rm -f '$iptsrcfiledest';" + IPTSLIBS="$IPTSLIBS $3" + IPTSSRC="$IPTSSRC $1" + $4 + ],[:;$5]) + ) + + IPAC_SEARCH_IPTABLES_SRCFILE(xtables.c,xtables.c,xtables.o, + [ + IPAC_SEARCH_IPTABLES_SRCFILE(xshared.h,xshared.h) + IPAC_SEARCH_IPTABLES_SRCFILE(xtoptions.c,xtoptions.c,xtoptions.o) + ], + [ + IPAC_SEARCH_IPTABLES_SRCFILE(xtables.c,iptables/xtables.c,xtables.o, + [ + IPTDOBEFORECC="$IPTDOBEFORECC mkdir -p '$PWD/agents/iptables/iptables'; ln -s -f -T '$PWD/agents/iptables/internal.h' '$PWD/agents/iptables/iptables/internal.h';" + IPTDOAFTERCC="$IPTDOAFTERCC rm -f -r '$PWD/agents/iptables/iptables';" + ], + [AC_MSG_ERROR([xtables.c not found. Check path to iptables source tree.])] + ) + IPAC_SEARCH_IPTABLES_SRCFILE(xshared.h,iptables/xshared.h) + IPAC_SEARCH_IPTABLES_SRCFILE(xtoptions.c,iptables/xtoptions.c,xtoptions.o) + ] + ) + + IPTSRCFILES="libiptc/libiptc.c libiptc/libip4tc.c libiptc/linux_list.h libiptc/linux_stddef.h" + for iptsrcfile1 in $IPTSRCFILES; do + iptsrcfile=`echo $iptsrcfile1 | cut -d/ -f2` + iptsrcfiledest=$PWD/agents/iptables/$iptsrcfile + AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, $iptsrcfile1) AC_CHECK_FILE($iptsrcfileabs, [], [AC_MSG_ERROR([$iptsrcfileabs not found. Check path to iptables source tree.])]) - cp -t agents/iptables $iptsrcfileabs + IPTDOBEFORECC="$IPTDOBEFORECC ln -s -f -T '$iptsrcfileabs' '$iptsrcfiledest';" + IPTDOAFTERCC="$IPTDOAFTERCC rm -f '$iptsrcfiledest';" + IPTSSRC="$IPTSSRC $iptsrcfile" done - IPTSLIBS="xtables.o libip4tc.o" + AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, include/xtables.h) + AC_CHECK_FILE($iptsrcfileabs, [], [AC_MSG_ERROR([xtables.h not found. Have you configured iptables source tree?])]) + AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, include/libiptc/libiptc.h) + AC_CHECK_FILE($iptsrcfileabs, [], [AC_MSG_ERROR([libiptc.h not found. Iptables source tree is incomplete.])]) + AC_CHECK_HEADERS([linux/magic.h linux/proc_fs.h]) + IPTSLIBS="$IPTSLIBS libip4tc.o" save_libs=$LIBS LIBS="" AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([libdl not found.])]) - LIBS="$LIBS $save_libs" + LIBS="$save_libs $LIBS" fi -fi -AC_SUBST(IPTSLIBS) + AC_SUBST(IPTSLIBS) + AC_SUBST(IPTSINC) + AC_SUBST(IPTSSRC) + AC_SUBST(XTABLES_LIBDIR) + AC_SUBST(IPTDOBEFORECC) + AC_SUBST(IPTDOAFTERCC) -AC_SUBST(XTABLES_LIBDIR) +fi AC_DEFUN([IPAC_DEFINE_AND_SUBST], [$1=$2] |
From: Sergey M. <sm...@us...> - 2011-09-25 23:21:11
|
Update of /cvsroot/ipac-ng/ipac-ng In directory vz-cvs-4.sog:/tmp/cvs-serv27930 Modified Files: configure configure.in fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 Log Message: Updated version to 1.34.2 Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure 17 Jul 2011 03:45:22 -0000 1.19 +++ configure 25 Sep 2011 23:21:09 -0000 1.20 @@ -2152,8 +2152,8 @@ ipac_in_default=ipac_in ipac_out_default=ipac_out -VERSION="1.34.1" -MANTIME="SEPTEMBER 2001" +VERSION="1.34.2" +MANTIME="SEPTEMBER 2011" ac_config_headers="$ac_config_headers config.h" Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- configure.in 17 Jul 2011 03:45:22 -0000 1.19 +++ configure.in 25 Sep 2011 23:21:09 -0000 1.20 @@ -27,8 +27,8 @@ dnl ipac_conffile_default=/etc/ipac.conf dnl ipac version number and manual time -VERSION="1.34.1" -MANTIME="SEPTEMBER 2001" +VERSION="1.34.2" +MANTIME="SEPTEMBER 2011" dnl ------------------------------------------------------------------------ dnl create config.h Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ipac-convert.8 17 Jul 2011 03:45:22 -0000 1.11 +++ ipac-convert.8 25 Sep 2011 23:21:09 -0000 1.12 @@ -3,7 +3,7 @@ .\" $Id$ .\" .\" =()<.TH IPAC-CONVERT 8 "@<MANTIME>@" Linux "IPAC-NG">()= -.TH IPAC-CONVERT 8 "SEPTEMBER 2001" Linux "IPAC-NG" +.TH IPAC-CONVERT 8 "SEPTEMBER 2011" Linux "IPAC-NG" .SH NAME ipac-convert \- convert ipac accounting data .SH SYNOPSIS @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.34.1. +This man page belongs to ipac version 1.34.2. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.22 retrieving revision 1.23 diff -u -d -r1.22 -r1.23 --- ipacsum 17 Jul 2011 03:45:22 -0000 1.22 +++ ipacsum 25 Sep 2011 23:21:09 -0000 1.23 @@ -52,7 +52,7 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="1.34.1"; +$version="1.34.2"; # =()<$prefix="@<prefix>@";>()= $prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- fetchipac.8 17 Jul 2011 03:45:22 -0000 1.14 +++ fetchipac.8 25 Sep 2011 23:21:09 -0000 1.15 @@ -3,7 +3,7 @@ .\" $Id$ .\" .\" =()<.TH FETCHIPAC 8 "@<MANTIME>@" Linux "IPAC-NG">()= -.TH FETCHIPAC 8 "SEPTEMBER 2001" Linux "IPAC-NG" +.TH FETCHIPAC 8 "SEPTEMBER 2011" Linux "IPAC-NG" .SH NAME fetchipac \- ip accounting kernel data and database handler .SH SYNOPSIS @@ -325,7 +325,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version 1.34.1. +This man page belongs to ipac-ng version 1.34.2. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- ipacsum.8 17 Jul 2011 03:45:22 -0000 1.11 +++ ipacsum.8 25 Sep 2011 23:21:09 -0000 1.12 @@ -3,7 +3,7 @@ .\" $Id$ .\" .\" =()<.TH IPACSUM 8 "@<MANTIME>@" Linux "IPAC-NG">()= -.TH IPACSUM 8 "SEPTEMBER 2001" Linux "IPAC-NG" +.TH IPACSUM 8 "SEPTEMBER 2011" Linux "IPAC-NG" .SH NAME ipacsum \- summarize, display and compact ip accounting information .SH SYNOPSIS @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.34.1. +This man page belongs to ipac version 1.34.2. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |
From: Sergey M. <sm...@us...> - 2011-09-25 23:12:27
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory vz-cvs-4.sog:/tmp/cvs-serv22100/agents/iptables Modified Files: iptables.c Log Message: Fixed incompatibility with iptables 1.4.11-1.4.12.1 and probably later Index: iptables.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- iptables.c 6 Sep 2010 21:57:35 -0000 1.9 +++ iptables.c 25 Sep 2011 23:12:24 -0000 1.10 @@ -69,6 +69,10 @@ | FMT_NUMERIC | FMT_NOTABLE) #define FMT(tab,notab) ((format) & FMT_NOTABLE ? (notab) : (tab)) +#if XTABLES_VERSION_CODE > 5 +#define IPT_ALIGN XT_ALIGN +#endif + static struct option original_opts[] = { {.name = "append", .has_arg = 1, .val = 'A'}, {.name = "delete", .has_arg = 1, .val = 'D'}, @@ -985,8 +989,13 @@ strcpy(m->m->u.user.name, m->name); if (m->init != NULL) m->init(m->m); +#if XTABLES_VERSION_CODE > 5 + opts = xtables_merge_options(iptables_globals.orig_opts, + opts, m->extra_opts, &m->option_offset); +#else opts = xtables_merge_options(opts, m->extra_opts, &m->option_offset); +#endif break; case 1: if (optarg[0] == '!' && optarg[1] == '\0') { |
From: Sergey M. <sm...@us...> - 2011-07-17 03:45:24
|
Update of /cvsroot/ipac-ng/ipac-ng In directory vz-cvs-4.sog:/tmp/cvs-serv11926 Modified Files: CHANGELOG configure configure.in fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 README Log Message: Updated to v.1.34.1 Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure 12 Sep 2010 11:59:20 -0000 1.18 +++ configure 17 Jul 2011 03:45:22 -0000 1.19 @@ -2152,7 +2152,7 @@ ipac_in_default=ipac_in ipac_out_default=ipac_out -VERSION=`pwd | sed 's%.*/ipac-ng-%%'` +VERSION="1.34.1" MANTIME="SEPTEMBER 2001" ac_config_headers="$ac_config_headers config.h" @@ -5248,7 +5248,7 @@ return 0; } _ACEOF -for ac_lib in '' iptc; do +for ac_lib in '' iptc ip4tc; do if test -z "$ac_lib"; then ac_res="none required" else @@ -5279,7 +5279,7 @@ test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" else - as_fn_error $? "libiptc not found. Install iptables with shared libraries support." "$LINENO" 5 + as_fn_error $? "libiptc/libip4tc not found. Install iptables with shared libraries support." "$LINENO" 5 fi LIBS="$LIBS $save_libs" Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- configure.in 12 Sep 2010 11:59:20 -0000 1.18 +++ configure.in 17 Jul 2011 03:45:22 -0000 1.19 @@ -27,7 +27,7 @@ dnl ipac_conffile_default=/etc/ipac.conf dnl ipac version number and manual time -VERSION=`pwd | sed 's%.*/ipac-ng-%%'` +VERSION="1.34.1" MANTIME="SEPTEMBER 2001" dnl ------------------------------------------------------------------------ @@ -517,7 +517,7 @@ AC_SEARCH_LIBS([xtables_init], [xtables], [], [AC_MSG_ERROR([libxtables not found. Install iptables with shared libraries support.])]) save_libs="$LIBS $save_libs" LIBS="" - AC_SEARCH_LIBS([iptc_init], [iptc], [], [AC_MSG_ERROR([libiptc not found. Install iptables with shared libraries support.])]) + AC_SEARCH_LIBS([iptc_init], [iptc ip4tc], [], [AC_MSG_ERROR([libiptc/libip4tc not found. Install iptables with shared libraries support.])]) LIBS="$LIBS $save_libs" else IPTSRCFILES="xtables.c libiptc/libiptc.c libiptc/libip4tc.c libiptc/linux_list.h libiptc/linux_stddef.h" Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ipac-convert.8 6 Sep 2010 21:57:35 -0000 1.10 +++ ipac-convert.8 17 Jul 2011 03:45:22 -0000 1.11 @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.34. +This man page belongs to ipac version 1.34.1. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- CHANGELOG 12 Sep 2010 11:59:20 -0000 1.36 +++ CHANGELOG 17 Jul 2011 03:45:22 -0000 1.37 @@ -34,6 +34,13 @@ same second or your database will be destroyed - no fix, other than removing support for gdbm, yet +1.34.1 +- fixed incompatibility with some linux distributions which use iptables 1.4.10 + and later. Confirmed ability to work with iptables 1.4.3 - 1.4.11.1 (with shared + iptables libraries, libxtables.so, libiptc.so and libip4tc.so). Static compilation + works only with iptables version up to 1.4.9.1, and not in all linux distributions + (due to patched header files) (sm) + 1.34 - ported to iptables 1.4.9.1, works with iptables 1.4.3 - 1.4.9.1, and maybe later (sm) - removed a lot of unused code from iptables.c (sm) Index: README =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/README,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- README 12 Sep 2010 11:59:20 -0000 1.5 +++ README 17 Jul 2011 03:45:22 -0000 1.6 @@ -97,16 +97,16 @@ "Network packet filtering (replaces ipchains)" set to "y" or "m". Also "IP tables support" and "Packet filtering" must be set to "y" or "m". -NOTE: ipac-ng 1.34 works with iptables 1.4.3 and higher (confirmed up to 1.4.9.1); +NOTE: ipac-ng 1.34 works with iptables 1.4.3 and higher (confirmed up to 1.4.11.1); ipac-ng 1.33 works with iptables 1.4.2; ipac-ng 1.32 and lower work with iptables 1.2.X and 1.3.X. ipac-ng 1.34 uses iptables shared libraries, so these libraries must exist in your system (i.e. iptables must be compiled with option which produces -these libraries: libxtables.so and libiptc.so). If your system doesn't provide -iptables shared libraries you can build ipac-ng with iptables source code. -See BUILD-with-iptables-source file in doc subdirectory for instructions -how to do it. +these libraries: libxtables.so and libiptc.so or libip4tc.so). If your system +doesn't provide iptables shared libraries you can build ipac-ng with iptables +source code. See BUILD-with-iptables-source file in doc subdirectory for +instructions how to do it. To compile ipac-ng 1.34 you will additionally need iptables headers. Please install iptables-dev package - it provides these headers. Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- ipacsum 6 Sep 2010 21:57:35 -0000 1.21 +++ ipacsum 17 Jul 2011 03:45:22 -0000 1.22 @@ -52,7 +52,7 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="1.34"; +$version="1.34.1"; # =()<$prefix="@<prefix>@";>()= $prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- fetchipac.8 12 Sep 2010 11:59:20 -0000 1.13 +++ fetchipac.8 17 Jul 2011 03:45:22 -0000 1.14 @@ -325,7 +325,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version 1.34. +This man page belongs to ipac-ng version 1.34.1. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- ipacsum.8 6 Sep 2010 21:57:35 -0000 1.10 +++ ipacsum.8 17 Jul 2011 03:45:22 -0000 1.11 @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.34. +This man page belongs to ipac version 1.34.1. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |
From: Sergey M. <sm...@us...> - 2010-09-12 16:23:52
|
Update of /cvsroot/ipac-ng/docs/admin In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv31875/admin Modified Files: developer-status.txt Log Message: Added me as project admin Index: developer-status.txt =================================================================== RCS file: /cvsroot/ipac-ng/docs/admin/developer-status.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- developer-status.txt 30 Jul 2009 22:51:58 -0000 1.6 +++ developer-status.txt 12 Sep 2010 16:23:44 -0000 1.7 @@ -1,4 +1,6 @@ -Currently there exit the following types of developers, listed with +$Id$ + +Currently there are the following types of developers, listed with their rights and the associated persons: status | access rights | name | @users.sourceforge.net @@ -6,6 +8,7 @@ Project | all rights | Al Zaharov | kaiser13 Admins | | Friedrich Lobenstock | friedl | | Mark Weaver | mdw21 + | | Sergey Merzlikin | smsoft ----------+----------------------+-----------------------+-------------------------- Developer | checkout from latest | Simon Hausmann | hausmann | CVS, no commit | | @@ -20,4 +23,4 @@ | | | ----------+----------------------+-----------------------+-------------------------- -$Id$ + |
From: Sergey M. <sm...@us...> - 2010-09-12 15:35:12
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv22988 Removed Files: .ignore Log Message: removing accidental file --- .ignore DELETED --- |
From: Sergey M. <sm...@us...> - 2010-09-12 15:29:03
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv21653 Removed Files: aclocal.m4 Log Message: removing accidental file --- aclocal.m4 DELETED --- |
From: Sergey M. <sm...@us...> - 2010-09-12 11:59:29
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13817 Modified Files: CHANGELOG README config.h.in configure configure.in fetchipac.8 Log Message: Added possibility to build with iptables source Index: config.h.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/config.h.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- config.h.in 6 Sep 2010 21:57:35 -0000 1.4 +++ config.h.in 12 Sep 2010 11:59:20 -0000 1.5 @@ -1,4 +1,4 @@ -/* config.h.in. Generated automatically from configure.in by autoheader. */ +/* $Id$ */ /* Define to empty if the keyword does not work. */ #undef const @@ -12,8 +12,6 @@ /* define default storage method */ #define DEFAULT_STORAGE xxx -#define XTABLES_LIBDIR xxx - /* define default accounting agent */ #define DEFAULT_AGENT xxx Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure 6 Sep 2010 21:57:35 -0000 1.17 +++ configure 12 Sep 2010 11:59:20 -0000 1.18 @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. +# Generated by GNU Autoconf 2.67. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. [...1473 lines suppressed...] - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 - fi - - cd "$ac_popdir" - done + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- CHANGELOG 6 Sep 2010 21:57:35 -0000 1.35 +++ CHANGELOG 12 Sep 2010 11:59:20 -0000 1.36 @@ -39,6 +39,8 @@ - removed a lot of unused code from iptables.c (sm) - removed xtables.c, libiptc.c, libip4tc.c and corresponding header files, but instead added dependency on iptables libraries: libxtables.so and libiptc.so (sm) +- added option to configure script: "--with-iptables-src=" which allows to compile + fetchipac statically with iptables source code (as it was in previous versions) (sm) - added ipacsumdaily/monthly perl scripts to contrib directory (sm) - updated documentation (sm) Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- configure.in 6 Sep 2010 21:57:35 -0000 1.17 +++ configure.in 12 Sep 2010 11:59:20 -0000 1.18 @@ -1,3 +1,4 @@ +dnl $Id$ dnl Process this file with autoconf to produce a configure script. AC_INIT(fetchipac.c) @@ -69,18 +70,23 @@ dnl check for library path options AC_ARG_WITH(postgresql_lib, - [--with-postgresql-lib=DIR location of postgresql library file], + [ --with-postgresql-lib=DIR location of postgresql library file], [CPPFLAGS="$CPPFLAGS -L$withval" postgresql_lib="-L$withval"]) dnl check for include path options AC_ARG_WITH(postgresql_inc, - [--with-postgresql-inc=DIR location of postgresql include files], + [ --with-postgresql-inc=DIR location of postgresql include files], [CPPFLAGS="-I$withval $CPPFLAGS" postgresql_inc="-I$withval"], [CPPFLAGS="-I$postgresql_inc_default $CPPFLAGS" postgresql_inc="-I$postgresql_inc_default"]) +AC_ARG_WITH(iptables-src, + [ --with-iptables-src=DIR location of iptables source tree to statically + compile with instead of linking to dynamic ones], + [IPTABLES_SRC=$withval]) + dnl Checks for libraries. AC_CHECK_LIB(pq, PQexec, [HAVE_LIBPQ=yes], [HAVE_LIBPQ=no]) test $HAVE_LIBPQ = no && AC_MSG_WARN([postgres library not found! @@ -95,9 +101,8 @@ AC_CHECK_LIB(sqlite, sqlite_get_table, [HAVE_LIBSQLITE=yes], [HAVE_LIBSQLITE=no]) test $HAVE_LIBSQLITE = no && AC_MSG_WARN([sqlite library not found! support for optional storage \"sqlite\" will be disabled]) -AC_CHECK_LIB(dl, dlopen) -LIBS="$LIBS -L. -lipac" +LIBS="$LIBS -L. -lipac" dnl Checks for header files if libraries found HAVE_POSTGRE=no @@ -245,8 +250,6 @@ fi storagemethod_makefiles="$storagemethod_makefiles storage/$sm/Makefile" - test -f "storage/$sm/configure" && \ - configure_dirs="$configure_dirs storage/$sm" STORAGEMETHODLIBRARYS="$STORAGEMETHODLIBRARYS storage/$sm/libstor$sm.a" LIBS="$LIBS -Lstorage/$sm -lstor$sm" dnl check if the storage method requires any libraries. @@ -259,8 +262,8 @@ AC_MSG_CHECKING([for default storage method]) IP_COMMENT="" AC_ARG_ENABLE(default-storage, -[--enable-default-storage=storage use storage method storage by default. - possible storage methods are plain-file +[ --enable-default-storage=storage use storage method storage by default. + Possible storage methods are plain-file and gdbm and any additional ones which are stored under storage/. The default depends on your system.], @@ -305,8 +308,6 @@ fi fi billagent_makefiles="$billagent_makefiles access/$ag/Makefile" - test -f "access/$ag/configure" && \ - configure_dirs="$configure_dirs access/$ag" BILLAGENTSLIBRARYS="$BILLAGENTSLIBRARYS access/$ag/libipac$ag.a" LIBS="$LIBS -Laccess/$ag -lipac$ag" dnl check if the access agents requires any libraries. @@ -319,8 +320,8 @@ AC_MSG_CHECKING([for default access agent]) IP_COMMENT="" AC_ARG_ENABLE(default-access, -[--enable-default-access=files set default access agent. - possible access agents are files (dumb) +[ --enable-default-access=files set default access agent. + Possible access agents are files (dumb) and any additional ones which are stored under access/. The default depends on your system. REMARK: DO NOT USE THIS OPTION! It @@ -340,8 +341,8 @@ AC_MSG_CHECKING([for default config directory]) IP_COMMENT="" AC_ARG_WITH(confdir, -[--with-confdir=directory use default directory for config files, - default is /etc/ipac-ng], +[ --with-confdir=directory use default directory for config files, + default is /etc/ipac-ng], CONFDIR=$withval,CONFDIR="") if test x$CONFDIR = x; then CONFDIR="/etc/ipac-ng" @@ -357,8 +358,8 @@ AC_MSG_CHECKING([for default config file]) IP_COMMENT="" AC_ARG_WITH(config, -[--with-config=config use default config file. default is \$CONFDIR/ipac.conf - ], +[ --with-config=config use default config file, + default is CONFDIR/ipac.conf], CONFFILE=$withval,CONFFILE="") if test x$CONFFILE = x; then CONFFILE="$CONFDIR/ipac.conf" @@ -375,14 +376,12 @@ dnl ----------------------------------- AC_MSG_CHECKING([for available accounting agents]) ACCAGENTS=`(cd agents && find . -type d -print) | - sed -e 's#^\./##' | egrep -v '\.|CVS' | tr '\n' ' '` + sed -e 's#^\./##' | egrep -v '\.|CVS|iptables/libiptc' | tr '\n' ' '` dnl AC_SUBST(ACCAGENTS) accagent_makefiles="" ACCAGENTSLIBRARYS="" for ag in $ACCAGENTS; do accagent_makefiles="$accagent_makefiles agents/$ag/Makefile" - test -f "agents/$ag/configure" && \ - configure_dirs="$configure_dirs agents/$ag" ACCAGENTSLIBRARYS="$ACCAGENTSLIBRARYS agents/$ag/libipac$ag.a" LIBS="$LIBS -Lagents/$ag -lipac$ag" dnl check if the accounting agents requires any libraries. @@ -398,8 +397,8 @@ AC_MSG_CHECKING([for default accounting agent]) IP_COMMENT="" AC_ARG_ENABLE(default-agent, -[--enable-default-agent=agent use accounting agent by default. - possible accounting agents is ipchains +[ --enable-default-agent=agent use accounting agent by default. + Possible accounting agents is ipchains and any additional ones which are stored under agents/. The default is iptables.], DEFAULT_AGENT=$enableval,DEFAULT_AGENT="") @@ -438,7 +437,7 @@ AC_MSG_CHECKING([if ipacsum debugging is desired]) IP_COMMENT="" AC_ARG_ENABLE(debug-ipacsum, -[--enable-debug-ipacsum=yes|no enable debugging in ipacsum.], +[ --enable-debug-ipacsum=yes|no enable debugging in ipacsum.], DEBUG_IPACSUM=$enableval,DEBUG_IPACSUM="") if test x$DEBUG_IPACSUM = x; then DEBUG_IPACSUM="no" @@ -458,8 +457,8 @@ AC_MSG_CHECKING([if database debugging is desired]) IP_COMMENT="" AC_ARG_ENABLE(debug-database, -[--enable-debug-database=yes|no switch on debugging of all accesses - to the backend database.], +[ --enable-debug-database=yes|no switch on debugging of all accesses + to the backend database.], DEBUG_DATABASE=$enableval,DEBUG_DATABASE="") if test x$DEBUG_DATABASE = x; then DEBUG_DATABASE="no" @@ -509,15 +508,37 @@ else AC_MSG_WARN([iptables library directory not found, define ] [it at config.h]) - fi + fi AC_CHECK_HEADERS(xtables.h, [], [AC_MSG_ERROR([xtables.h not found. Install iptables-dev package.])]) AC_CHECK_HEADERS(libiptc/libiptc.h, [], [AC_MSG_ERROR([libiptc.h not found. Install iptables-dev package.])]) + if test x$IPTABLES_SRC = x; then + save_libs=$LIBS + LIBS="" + AC_SEARCH_LIBS([xtables_init], [xtables], [], [AC_MSG_ERROR([libxtables not found. Install iptables with shared libraries support.])]) + save_libs="$LIBS $save_libs" + LIBS="" + AC_SEARCH_LIBS([iptc_init], [iptc], [], [AC_MSG_ERROR([libiptc not found. Install iptables with shared libraries support.])]) + LIBS="$LIBS $save_libs" + else + IPTSRCFILES="xtables.c libiptc/libiptc.c libiptc/libip4tc.c libiptc/linux_list.h libiptc/linux_stddef.h" + for iptsrcfile in $IPTSRCFILES; do + AS_SET_CATFILE(iptsrcfileabs, $IPTABLES_SRC, $iptsrcfile) + AC_CHECK_FILE($iptsrcfileabs, [], [AC_MSG_ERROR([$iptsrcfileabs not found. Check path to iptables source tree.])]) + cp -t agents/iptables $iptsrcfileabs + done + IPTSLIBS="xtables.o libip4tc.o" + save_libs=$LIBS + LIBS="" + AC_SEARCH_LIBS([dlopen], [dl], [], [AC_MSG_ERROR([libdl not found.])]) + LIBS="$LIBS $save_libs" + fi fi +AC_SUBST(IPTSLIBS) + AC_SUBST(XTABLES_LIBDIR) -AC_DEFINE_UNQUOTED(XTABLES_LIBDIR,"$XTABLES_LIBDIR") -AC_DEFUN(IPAC_DEFINE_AND_SUBST, +AC_DEFUN([IPAC_DEFINE_AND_SUBST], [$1=$2] [AC_SUBST($1)] [AC_DEFINE_UNQUOTED($1,"$$1")]) @@ -556,8 +577,8 @@ AC_MSG_CHECKING([for default database name]) IP_COMMENT="" AC_ARG_WITH(dbase-name, -[--with-dbase-name=name use default database name, - default is ipac], +[ --with-dbase-name=name use default database name, + default is ipac], DBASE=$withval,DBASE="") if test x$DBASE = x; then DBASE="ipac" @@ -573,8 +594,8 @@ AC_MSG_CHECKING([for default database port]) IP_COMMENT="" AC_ARG_WITH(dbase-port, -[--with-dbase-port=port use default database port, - default is NULL (database is local)], +[ --with-dbase-port=port use default database port, + default is NULL (database is local)], DBASE_PORT=$withval,DBASE_PORT="") if test x$DBASE_PORT = x; then DBASE_PORT="" @@ -586,7 +607,6 @@ AC_DEFINE_UNQUOTED(DBASE_PORT,"$DBASE_PORT") AC_SUBST(DBASE_PORT) -AC_CONFIG_SUBDIRS($configure_dirs) AC_OUTPUT(Makefile storage/Makefile agents/Makefile access/Makefile \ subst-config $billagent_makefiles $accagent_makefiles \ $storagemethod_makefiles ipactest) Index: README =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/README,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- README 6 Sep 2010 21:57:35 -0000 1.4 +++ README 12 Sep 2010 11:59:20 -0000 1.5 @@ -103,7 +103,10 @@ ipac-ng 1.34 uses iptables shared libraries, so these libraries must exist in your system (i.e. iptables must be compiled with option which produces -these libraries: libxtables.so and libiptc.so). +these libraries: libxtables.so and libiptc.so). If your system doesn't provide +iptables shared libraries you can build ipac-ng with iptables source code. +See BUILD-with-iptables-source file in doc subdirectory for instructions +how to do it. To compile ipac-ng 1.34 you will additionally need iptables headers. Please install iptables-dev package - it provides these headers. Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- fetchipac.8 6 Sep 2010 21:57:35 -0000 1.12 +++ fetchipac.8 12 Sep 2010 11:59:20 -0000 1.13 @@ -302,25 +302,19 @@ The spool file. .RE .SH DIAGNOSTICS -.I Warning: ipac chains and/or jumps are corrupted. +.I Warning: ipac-ng chains or rules corrupted. .RS -Some program or human deleted one of ipac's chains or jump rules. This -probably means that no traffic was counted by ipac since the deletion. +Some program or human deleted one of ipac's chains or rules. This +probably means that no traffic was counted by ipac-ng since the deletion. It may be caused by firewall set up scripts. For example, performing -.I ipchains --flush +.I iptables --flush or .I -F has this effect. Just do .B fetchipac -S to fix this. -.RE -.I No ip firewall / accounting code in the kernel. -.RS -The kernel had been compiled without the ip accounting feature. -.RE - -And many more messages which are meant to speak for themselves. +And some more messages which are meant to speak for themselves. .SH BUGS Resetting accounting data counters on ipchains systems resets all counters; there is no way to reset only ipac's counters. Thus, you |
From: Sergey M. <sm...@us...> - 2010-09-12 11:59:28
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13817/agents/iptables Modified Files: Makefile.in Log Message: Added possibility to build with iptables source Index: Makefile.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in 6 Sep 2010 21:57:35 -0000 1.7 +++ Makefile.in 12 Sep 2010 11:59:20 -0000 1.8 @@ -1,21 +1,23 @@ # $Id$ # Makefile for iptables -# NEEDLIBS=-lxtables -liptc + SAGENT=iptables CFLAGS=@CFLAGS@ CC=@CC@ -DEFS=@DEFS@ -DNDEBUG +DEFS=@DEFS@ -DNDEBUG -DXTABLES_LIBDIR=\"@XTABLES_LIBDIR@\" +SLIBS=@IPTSLIBS@ all: libipac$(SAGENT).a -libipac$(SAGENT).a: iptables.o +libipac$(SAGENT).a: iptables.o $(SLIBS) ar -crus libipac$(SAGENT).a $? %.o: %.c ../../config.h ../../ipac.h - $(CC) -DXTABLES_INTERNAL -c -I. -I../.. -lxtables -liptc $(DEFS) $(CFLAGS) $< -o $@ + $(CC) -DXTABLES_INTERNAL -c -I. -I../.. $(DEFS) $(CFLAGS) $< -o $@ clean: rm -f *.a *.o distclean: rm -f Makefile *~ *.orig + rm -f xtables.c libiptc.c libip4tc.c linux_list.h linux_stddef.h |
From: Sergey M. <sm...@us...> - 2010-09-12 11:59:28
|
Update of /cvsroot/ipac-ng/ipac-ng/doc In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv13817/doc Added Files: BUILD-with-iptables-source Log Message: Added possibility to build with iptables source --- NEW FILE: BUILD-with-iptables-source --- $Id: BUILD-with-iptables-source,v 1.1 2010/09/12 11:59:20 smsoft Exp $ BUILDING ipac-ng with iptables source code ========================================== With version 1.34 fetchipac program became to use iptables shared libraries: libxtables.so and libiptc.so. So, these libraries must exist in your system if you are building ipac-ng with default configuration options. If your Linux distribution doesn't provide these libraries there is a way to compile iptables source code into fetchipac program. How to do it? Firstly, you will need to obtain iptables source package. The preferred origin of this package is your Linux distribution, acceptable origin is http://www.netfilter.org, the home page of iptables project. Note, iptables source package version must match version of iptables binaries and headers installed in your system. Unpack obtained iptables source package to some directory. You will need al least read access to this directory while building ipac-ng. Go to ipac-ng source tree root, and run configure script with following option: ./configure --with-iptables-src=DIR where DIR is directory where you unpacked iptables sources. Note, configure script will copy some files from iptables source tree to ipac-ng source tree. You will see these files in agents/iptables directory. Compile and install ipac-ng as usual: make sudo make install Note, you will need to recompile and reinstall ipac-ng every time after changing iptables version installed in your system. |
From: Sergey M. <sm...@us...> - 2010-09-06 22:50:54
|
Update of /cvsroot/ipac-ng/ipac-ng/contrib/ipacsum_daily_monthly In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv12446 Added Files: README ipac-ng-daily ipacsum-daily ipacsum-monthly ipacsumdaily.pl ipacsumday.pl ipacsummonth.pl ipacsummonthly.pl Log Message: Adding auxiliary scripts --- NEW FILE: ipacsumday.pl --- #!/usr/bin/perl use strict; use DateTime; my @data=(); my %columns; my @dates=(); my $outfile=$ARGV[1]; my $year; my $month; my $day; if(!$outfile) { &print_usage(); exit(1); } if($ARGV[0]!~/(\d{2})\/(\d{2})\/(\d{4})/) { &print_usage(); exit(1); } else { $year=$3; $month=$2; $day=$1; } my $i; my $j=0; my $dt = DateTime->new( year => $year, month => $month, day => $day, time_zone => 'local' ); my $dt1 = $dt->clone; while ($day == $dt->day) { $dt1->add( hours => 1 ); my $t1=$dt->strftime('%Y%m%d%H'); my $t2=$dt1->strftime('%Y%m%d%H'); my @output = `ipacsum -x -s $t1 -e $t2 2>/dev/null`; if($#output>=3) { for $i(3 .. $#output) { $output[$i]=~/\s*(.*?)\s*:\s*(\d*)/; $columns{$1}=1; $data[$j]{$1}=$2; } } else { $data[$j]={}; } $dates[$j]=$dt->strftime('%d/%m/%y %R') . $dt1->strftime('-%R') ; $dt->add( hours => 1 ); $j++; } open(OUT,">$outfile") or print "Could not open $outfile\n"; my @col= sort keys %columns; my $outline='Date Time'; for $i(0 .. $#col) { $outline .= ';' . $col[$i]; } print OUT "$outline\n"; for $j(0 .. $#data) { $outline=$dates[$j]; for $i(0 .. $#col) { $outline .= ';' . $data[$j]{$col[$i]} ; } print OUT "$outline\n"; } close OUT; sub print_usage { print "\n==============================\n"; print " ipacsumday.pl - 2007-02-15\n"; print "==============================\n\n"; print "Creates CSV file with statistic for given day, one line per hour.\n\n"; print "Usage:\n\n"; print "ipacsumday.pl DD/MM/YYYY outfile.csv\n\n"; } --- NEW FILE: ipacsummonth.pl --- #!/usr/bin/perl use strict; use DateTime; my @data=(); my %columns; my @dates=(); my $outfile=$ARGV[1]; my $year; my $month; if(!$outfile) { &print_usage(); exit(1); } if($ARGV[0]!~/(\d{2})\/(\d{4})/) { &print_usage(); exit(1); } else { $year=$2; $month=$1; } my $i; my $j=0; my $dt = DateTime->new( year => $year, month => $month, time_zone => 'local' ); my $dt1 = $dt->clone; while ($month == $dt->month) { $dt1->add( days => 1 ); my $t1=$dt->strftime('%Y%m%d'); my $t2=$dt1->strftime('%Y%m%d'); my @output = `/usr/sbin/ipacsum -x -s $t1 -e $t2 2>/dev/null`; if($#output>=3) { for $i(3 .. $#output) { $output[$i]=~/\s*(.*?)\s*:\s*(\d*)/; $columns{$1}=1; $data[$j]{$1}=$2; } } else { $data[$j]={}; } $dates[$j]=$dt->dmy('/'); $dt->add( days => 1 ); $j++; } open(OUT,">$outfile") or print "Could not open $outfile\n"; my @col= sort keys %columns; my $outline='Date'; for $i(0 .. $#col) { $outline .= ';' . $col[$i]; } print OUT "$outline\n"; for $j(0 .. $#data) { $outline=$dates[$j]; for $i(0 .. $#col) { $outline .= ';' . $data[$j]{$col[$i]} ; } print OUT "$outline\n"; } close OUT; sub print_usage { print "\n==============================\n"; print " ipacsummonth.pl - 2007-02-12\n"; print "==============================\n\n"; print "Creates CSV file with statistic for given month, one line per day.\n\n"; print "Usage:\n\n"; print "ipacsummonth.pl MM/YYYY outfile.csv\n\n"; } --- NEW FILE: ipac-ng-daily --- #!/bin/sh test -f /proc/net/ip_tables_names && test -f /etc/ipac-ng/ipac.conf && test -f /usr/sbin/fetchipac && test -f /usr/sbin/ipacsum|| exit 0 # every day, sum up the data of 7 days ago into one record. /usr/bin/nice /usr/sbin/ipacsum -r -t "the day 7 days ago" -H all >/dev/null --- NEW FILE: ipacsum-monthly --- #!/bin/sh test -f /etc/ipac-ng/ipacsummonthly.pl || exit 0 /usr/bin/nice /etc/ipac-ng/ipacsummonthly.pl --- NEW FILE: README --- ipacsumdaily/monthly - scripts which create CSV files with daily/montly traffic statistic and send them to system administrator. (c) 2010 Sergey Merzlikin (sm...@sm...) ipacsumday.pl - creates CSV file with daily traffic statistic, one line per hour. Usage: ipacsumday.pl DD/MM/YYYY outfile.csv. ipacsumdaily.pl - creates CSV file with daily traffic statistic for previous day and sends it by e-mail to system administrator. Uses ipacsumday.pl. Both scripts must be in the same directory. To change CSV files storage filder, sender and recipient addresses edit script source. ipacsum-daily - cron job script which runs ipacsumdaily.pl. Copy it to /etc/cron.daily. ipacsummonth.pl - creates CSV file with monthly traffic statistic, one line per day. Usage: ipacsummonth.pl MM/YYYY outfile.csv. ipacsummonthly.pl - creates CSV file with monthly traffic statistic for previous month and sends it by e-mail to system administrator. Uses ipacsummonth.pl. Both scripts must be in the same directory. To change CSV files storage filder, sender and recipient addresses edit script source. ipacsum-monthly - cron job script which runs ipacsummonthly.pl. Copy it to /etc/cron.monthly. ipac-ng-daily - cron job script which compacts ipac-ng database. It sums up the data of 7 days ago into one record. NOTE: edit source of every script to change paths to values used in your system. NOTE: Perl scripts require some packages specufied in 'use' statements. Install them via cpan. --- NEW FILE: ipacsum-daily --- #!/bin/sh test -f /etc/ipac-ng/ipacsumdaily.pl || exit 0 /usr/bin/nice /etc/ipac-ng/ipacsumdaily.pl --- NEW FILE: ipacsumdaily.pl --- #!/usr/bin/perl -w use strict; use DateTime; use MIME::Lite; use File::Spec; use Sys::Hostname::FQDN qw(short); my $csvpath = '/var/lib/ipac/csv'; # Path to store CSV files my $sender = 'root'; # E-mail sender address my $recipient = 'root'; # E-mail recipient(s) address. Set it to empty string to disable mailung. my $dt = DateTime->now(time_zone => 'local')->truncate( to => 'day' ); $dt->subtract( days => 1 ); # The beginning of previous day my $dtt = $dt->strftime("%d/%m/%Y"); mkdir $csvpath; my $fn = 'Daily-' . $dt->strftime('%Y%m%d') . '.csv'; my $fnpath = File::Spec->catfile( $csvpath, $fn ); my ($scriptvol, $scriptdir); ($scriptvol, $scriptdir, ) = File::Spec->splitpath(__FILE__); my $ipacsumday = File::Spec->catpath($scriptvol, $scriptdir, 'ipacsumday.pl' ); `$ipacsumday $dtt $fnpath`; if ($sender) { if ($recipient) { if (-e $fnpath) { my $msg = MIME::Lite->new( From => $sender, To => $recipient, Subject => short() . ": Daily traffic statistic - $dtt", Type => 'multipart/mixed' ); $msg->attach( Type => 'text/plain; charset="UTF-8"', Encoding => '8bit', Data => 'See daily traffic statistic file in attachment.' ); $msg->attach( Type => 'application/octet-stream', Encoding => 'base64', Path => $fnpath, Disposition => 'attachment' ); $msg->send; } } } --- NEW FILE: ipacsummonthly.pl --- #!/usr/bin/perl -w use strict; use DateTime; use MIME::Lite; use File::Spec; use Sys::Hostname::FQDN qw(short); my $csvpath = '/var/lib/ipac/csv'; # Path to store CSV files my $sender = 'root'; # E-mail sender address my $recipient = 'root'; # E-mail recipient(s) address. Set it to empty string to disable mailung. my $dt = DateTime->now(time_zone => 'local')->truncate( to => 'month' ); $dt->subtract( months => 1 ); # The beginning of previous month my $dtt = $dt->strftime('%m/%Y'); mkdir $csvpath; my $fn = 'Monthly-' . $dt->strftime('%Y%m') . '.csv'; my $fnpath = File::Spec->catfile( $csvpath, $fn ); my ($scriptvol, $scriptdir); ($scriptvol, $scriptdir, ) = File::Spec->splitpath(__FILE__); my $ipacsummonth = File::Spec->catpath($scriptvol, $scriptdir, 'ipacsummonth.pl' ); `$ipacsummonth $dtt $fnpath`; if ($sender) { if ($recipient) { if (-e $fnpath) { my $msg = MIME::Lite->new( From => $sender, To => $recipient, Subject => short() . ": Monthly traffic statistic - $dtt", Type => 'multipart/mixed' ); $msg->attach( Type => 'text/plain; charset="UTF-8"', Encoding => '8bit', Data => 'See monthly traffic statistic file in attachment.' ); $msg->attach( Type => 'application/octet-stream', Encoding => 'base64', Path => $fnpath, Disposition => 'attachment' ); $msg->send; } } } |
From: Sergey M. <sm...@us...> - 2010-09-06 22:44:38
|
Update of /cvsroot/ipac-ng/ipac-ng/contrib/ipacsum_daily_monthly In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11306/ipacsum_daily_monthly Log Message: Directory /cvsroot/ipac-ng/ipac-ng/contrib/ipacsum_daily_monthly added to the repository |
From: Sergey M. <sm...@us...> - 2010-09-06 22:38:33
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10327/agents/iptables Removed Files: ipt_kernel_headers.h libip4tc.c libip6tc.c libip6tc.h libiptc.c libiptc.h libxtc.h linux_list.h linux_stddef.h xtables.c xtables.h Log Message: Removing unused files --- libip6tc.c DELETED --- --- ipt_kernel_headers.h DELETED --- --- xtables.c DELETED --- --- xtables.h DELETED --- --- libip4tc.c DELETED --- --- libip6tc.h DELETED --- --- linux_stddef.h DELETED --- --- libiptc.h DELETED --- --- linux_list.h DELETED --- --- libiptc.c DELETED --- --- libxtc.h DELETED --- |
Update of /cvsroot/ipac-ng/ipac-ng In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2431 Modified Files: CHANGELOG README config.h.in configure configure.in fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 Log Message: Updated to ipac-ng 1.34 Index: config.h.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- config.h.in 14 Nov 2003 19:51:29 -0000 1.3 +++ config.h.in 6 Sep 2010 21:57:35 -0000 1.4 @@ -12,7 +12,7 @@ /* define default storage method */ #define DEFAULT_STORAGE xxx -#define IPT_LIB_DIR xxx +#define XTABLES_LIBDIR xxx /* define default accounting agent */ #define DEFAULT_AGENT xxx Index: configure =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure 2 Aug 2009 13:49:40 -0000 1.16 +++ configure 6 Sep 2010 21:57:35 -0000 1.17 @@ -1,60 +1,83 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61. +# Generated by GNU Autoconf 2.65. +# # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# [...8360 lines suppressed...] -echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} + { $as_echo "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 +$as_echo "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} # The eval makes quoting arguments work. eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - { { echo "$as_me:$LINENO: error: $ac_sub_configure failed for $ac_dir" >&5 -echo "$as_me: error: $ac_sub_configure failed for $ac_dir" >&2;} - { (exit 1); exit 1; }; } + as_fn_error "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 fi cd "$ac_popdir" done fi +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} +fi Index: configure.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/configure.in,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- configure.in 2 Aug 2009 13:49:41 -0000 1.16 +++ configure.in 6 Sep 2010 21:57:35 -0000 1.17 @@ -495,25 +495,27 @@ if test $DEFAULT_AGENT = iptables; then # test for the 64 bit libs first (18.04.2004 - Thomas Zehetbauer <th...@ho...>) if test -d /usr/lib64/xtables; then - IPT_LIB_DIR=/usr/lib64/xtables + XTABLES_LIBDIR=/usr/lib64/xtables elif test -d /lib64/xtables; then - IPT_LIB_DIR=/lib64/xtables + XTABLES_LIBDIR=/lib64/xtables elif test -d /usr/local/lib64/xtables; then - IPT_LIB_DIR=/usr/local/lib64/xtables + XTABLES_LIBDIR=/usr/local/lib64/xtables elif test -d /usr/lib/xtables; then - IPT_LIB_DIR=/usr/lib/xtables + XTABLES_LIBDIR=/usr/lib/xtables elif test -d /lib/xtables; then - IPT_LIB_DIR=/lib/xtables + XTABLES_LIBDIR=/lib/xtables elif test -d /usr/local/lib/xtables; then - IPT_LIB_DIR=/usr/local/lib/xtables + XTABLES_LIBDIR=/usr/local/lib/xtables else AC_MSG_WARN([iptables library directory not found, define ] [it at config.h]) fi + AC_CHECK_HEADERS(xtables.h, [], [AC_MSG_ERROR([xtables.h not found. Install iptables-dev package.])]) + AC_CHECK_HEADERS(libiptc/libiptc.h, [], [AC_MSG_ERROR([libiptc.h not found. Install iptables-dev package.])]) fi -AC_SUBST(IPT_LIB_DIR) -AC_DEFINE_UNQUOTED(IPT_LIB_DIR,"$IPT_LIB_DIR") +AC_SUBST(XTABLES_LIBDIR) +AC_DEFINE_UNQUOTED(XTABLES_LIBDIR,"$XTABLES_LIBDIR") AC_DEFUN(IPAC_DEFINE_AND_SUBST, [$1=$2] Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ipac-convert.8 2 Aug 2009 13:49:41 -0000 1.9 +++ ipac-convert.8 6 Sep 2010 21:57:35 -0000 1.10 @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version /home/mark/ipac/ipac-ng. +This man page belongs to ipac version 1.34. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- CHANGELOG 2 Aug 2009 14:12:39 -0000 1.34 +++ CHANGELOG 6 Sep 2010 21:57:35 -0000 1.35 @@ -12,6 +12,7 @@ # kaiser13/az ......... Al Zakharov <kaiser13 at users dot sourceforge dot net> # friedl/fl ........... Friedrich Lobenstock <fl at fl dot priv dot at> # mpoos ............... Mark Spieth <mpoos at users dot sourceforge dot net> +# sm ...................Sergey Merzlikin <smsoft at sm dot smsoft dot ru> # # contributors: # Thomas Zehetbauer <thomasz at hostmaster dot org> @@ -33,6 +34,14 @@ same second or your database will be destroyed - no fix, other than removing support for gdbm, yet +1.34 +- ported to iptables 1.4.9.1, works with iptables 1.4.3 - 1.4.9.1, and maybe later (sm) +- removed a lot of unused code from iptables.c (sm) +- removed xtables.c, libiptc.c, libip4tc.c and corresponding header files, + but instead added dependency on iptables libraries: libxtables.so and libiptc.so (sm) +- added ipacsumdaily/monthly perl scripts to contrib directory (sm) +- updated documentation (sm) + 1.33 - ported to iptables 1.4.2 (mdw21) Index: README =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/README,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- README 11 Apr 2004 20:18:29 -0000 1.3 +++ README 6 Sep 2010 21:57:35 -0000 1.4 @@ -1,3 +1,4 @@ +$Id$ IPAC-NG (IPAC next generation) (c) 1997 - 2000 Moritz Both @@ -87,7 +88,7 @@ * filter, read the fetchipac man page, section BUGS! -PRECONDITIONS FOR 2.4.* kernels +PRECONDITIONS FOR 2.4.* and 2.6.* kernels You'll need an iptables tool. Don't even try to use ipchains with 2.4.* kernels. There is a bug that don't allow correct counters zeroing. @@ -95,8 +96,23 @@ You need a kernel which was compiled with the configuration option "Network packet filtering (replaces ipchains)" set to "y" or "m". Also "IP tables support" and "Packet filtering" must be set to "y" or "m". -You also need iptables tool. I've tested 1.2.1/1.2.1a/1.2.2. +NOTE: ipac-ng 1.34 works with iptables 1.4.3 and higher (confirmed up to 1.4.9.1); + ipac-ng 1.33 works with iptables 1.4.2; + ipac-ng 1.32 and lower work with iptables 1.2.X and 1.3.X. + +ipac-ng 1.34 uses iptables shared libraries, so these libraries must exist +in your system (i.e. iptables must be compiled with option which produces +these libraries: libxtables.so and libiptc.so). + +To compile ipac-ng 1.34 you will additionally need iptables headers. +Please install iptables-dev package - it provides these headers. + +NOTE: ipac-ng 1.33 and higher (especially fetchipac program) must be used + with the same version of iptables which it was compiled with, + otherwise memory corruption may occur. Some versions may be compatible, + but to be on the safe side, you should avoid version mixing. + Always recompile/reinstall ipac-ng after iptables uprgades/downgrades! INSTALLATION / OVERVIEW @@ -131,9 +147,13 @@ INSTALLATION / CONFIG FILE. -The ipac.conf file is '/etc/ipac-ng/ipac.conf'. ipac.conf controls what data -is collected. Each line which begins with a '#' is ignored. All the -other lines have the format +The ipac.conf file is '/etc/ipac-ng/ipac.conf'. See ipac.conf.sample file +in doc subdirectory for its format. This file references to rules file +which is typically '/etc/ipac-ng/rules.conf'. + +Rules file controls what data is collected. +Each line which begins with a '#' is ignored. All the other lines have +the format Name of rule|direction|interface|protocol|source|destination @@ -156,7 +176,7 @@ * You must run the fetchipac -S after changing the * ipac.conf file every time for the changes to take effect! -An example ipac.conf file comes with the distribution. +An example ipac.conf and ipac.rules files come with the distribution. Since of version 1.09 of ipac-ng there are some improvements done: 1) you may define user-defined accounting chains for the sake of speed; Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- ipacsum 2 Aug 2009 13:49:41 -0000 1.20 +++ ipacsum 6 Sep 2010 21:57:35 -0000 1.21 @@ -52,9 +52,9 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="/home/mark/ipac/ipac-ng"; +$version="1.34"; # =()<$prefix="@<prefix>@";>()= -$prefix="/usr/local"; +$prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= $exec_prefix="${prefix}"; # =()<$INSTALLPATH="@<INSTALLPATH>@";>()= Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- fetchipac.8 2 Aug 2009 13:49:41 -0000 1.11 +++ fetchipac.8 6 Sep 2010 21:57:35 -0000 1.12 @@ -126,7 +126,7 @@ its name is .IR spool . If there is already data in this spool file, the new records are appended. -The data is stored in this file in the same format as described unter the +The data is stored in this file in the same format as described under the batch mode command ADD (see below). Whenever @@ -302,33 +302,25 @@ The spool file. .RE .SH DIAGNOSTICS -.I Warning: ipac chains and/or jumps are corrupted. Trying to fix them +.I Warning: ipac chains and/or jumps are corrupted. .RS Some program or human deleted one of ipac's chains or jump rules. This probably means that no traffic was counted by ipac since the deletion. -It -may be caused by firewall set up scripts. For example, performing +It may be caused by firewall set up scripts. For example, performing .I ipchains --flush or .I -F -has this effect. -.B fetchipac -automatically runs -.I ipacset --fix-chains -to fix this condition. See -.BR ipacset (8), -section BUGS, for details. -Sorry, this section is obsolete and needs to be rewritten, just do +has this effect. Just do .B fetchipac -S +to fix this. + .RE -.I no ip firewall / accounting code in the kernel +.I No ip firewall / accounting code in the kernel. .RS The kernel had been compiled without the ip accounting feature. .RE -.I many more messages -.RS -Which are meant to speak for themselves. -.RE + +And many more messages which are meant to speak for themselves. .SH BUGS Resetting accounting data counters on ipchains systems resets all counters; there is no way to reset only ipac's counters. Thus, you @@ -339,7 +331,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version /home/mark/ipac/ipac-ng. +This man page belongs to ipac-ng version 1.34. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- ipacsum.8 2 Aug 2009 13:49:41 -0000 1.9 +++ ipacsum.8 6 Sep 2010 21:57:35 -0000 1.10 @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version /home/mark/ipac/ipac-ng. +This man page belongs to ipac version 1.34. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |
From: Sergey M. <sm...@us...> - 2010-09-06 21:57:43
|
Update of /cvsroot/ipac-ng/ipac-ng/agents/iptables In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv2431/agents/iptables Modified Files: Makefile.in internal.h iptables.c iptables.h Log Message: Updated to ipac-ng 1.34 Index: iptables.h =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- iptables.h 2 Aug 2009 13:49:41 -0000 1.1 +++ iptables.h 6 Sep 2010 21:57:35 -0000 1.2 @@ -1,31 +1,26 @@ +/* $Id$ + * ipac-ng v.1.34 + * Part of this code taken from iptables 1.4.9.1 + */ #ifndef _IPTABLES_USER_H #define _IPTABLES_USER_H #include <netinet/ip.h> #include <xtables.h> -#include <libiptc.h> - -#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */ -#define IPT_SO_GET_REVISION_MATCH (IPT_BASE_CTL + 2) -#define IPT_SO_GET_REVISION_TARGET (IPT_BASE_CTL + 3) -#endif /* IPT_SO_GET_REVISION_MATCH Old kernel source */ - -#define iptables_rule_match xtables_rule_match -#define ipt_tryload xt_tryload - -extern int line; +#include <libiptc/libiptc.h> +#include <internal.h> /* Your shared library should call one of these. */ extern int do_command(int argc, char *argv[], char **table, - iptc_handle_t *handle); + struct iptc_handle **handle); extern int delete_chain(const ipt_chainlabel chain, int verbose, - iptc_handle_t *handle); + struct iptc_handle *handle); extern int flush_entries(const ipt_chainlabel chain, int verbose, - iptc_handle_t *handle); -extern int for_each_chain(int (*fn)(const ipt_chainlabel, int, iptc_handle_t *), - int verbose, int builtinstoo, iptc_handle_t *handle); + struct iptc_handle *handle); +extern int for_each_chain(int (*fn)(const ipt_chainlabel, int, struct iptc_handle *), + int verbose, int builtinstoo, struct iptc_handle *handle); extern void print_rule(const struct ipt_entry *e, - iptc_handle_t *handle, const char *chain, int counters); + struct iptc_handle *handle, const char *chain, int counters); /* kernel revision handling */ extern int kernel_version; @@ -35,4 +30,7 @@ #define LINUX_VERSION_MINOR(x) (((x)>> 8) & 0xFF) #define LINUX_VERSION_PATCH(x) ( (x) & 0xFF) +extern struct xtables_globals iptables_globals; + #endif /*_IPTABLES_USER_H*/ + Index: Makefile.in =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.in 2 Aug 2009 13:49:41 -0000 1.6 +++ Makefile.in 6 Sep 2010 21:57:35 -0000 1.7 @@ -1,5 +1,6 @@ # $Id$ -# Makefile for plain-file +# Makefile for iptables +# NEEDLIBS=-lxtables -liptc SAGENT=iptables CFLAGS=@CFLAGS@ CC=@CC@ @@ -7,11 +8,11 @@ all: libipac$(SAGENT).a -libipac$(SAGENT).a: iptables.o xtables.o libip4tc.o +libipac$(SAGENT).a: iptables.o ar -crus libipac$(SAGENT).a $? %.o: %.c ../../config.h ../../ipac.h - $(CC) -DXTABLES_INTERNAL -c -I. -I../.. $(DEFS) $(CFLAGS) $< -o $@ + $(CC) -DXTABLES_INTERNAL -c -I. -I../.. -lxtables -liptc $(DEFS) $(CFLAGS) $< -o $@ clean: rm -f *.a *.o Index: iptables.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/iptables.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- iptables.c 2 Aug 2009 13:49:41 -0000 1.8 +++ iptables.c 6 Sep 2010 21:57:35 -0000 1.9 @@ -1,3 +1,8 @@ +/* $Id$ + * ipac-ng v.1.34 + * Part of this code taken from iptables 1.4.9.1 + */ + /* Code to take an iptables-style command line and do it. */ /* @@ -29,6 +34,7 @@ #include <string.h> #include <netdb.h> [...2426 lines suppressed...] if (!handle) iptables_ipac_init(0); if (iptc_is_chain(ch_name, handle)) { - iptc_flush_entries(ch_name, &handle); - iptc_delete_chain(ch_name, &handle); - iptc_commit(&handle); + iptc_flush_entries(ch_name, handle); + iptc_delete_chain(ch_name, handle); + iptc_commit(handle); iptables_ipac_init(0); // always do init after commit! } } @@ -3086,6 +1377,6 @@ iptables_ipac_init(0); strcpy(d.dest, "FORWARD"); strcpy(d.target, "DROP"); ret = insert_rule(&d, 0); - iptc_commit(&handle); + iptc_commit(handle); return ret; } Index: internal.h =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/agents/iptables/internal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- internal.h 2 Aug 2009 13:49:41 -0000 1.1 +++ internal.h 6 Sep 2010 21:57:35 -0000 1.2 @@ -1,66 +1,11 @@ -#ifndef _XTABLES_INTERNAL_H -#define _XTABLES_INTERNAL_H 1 - -#ifndef XT_LIB_DIR -# define XT_LIB_DIR "/usr/local/lib/iptables" -#endif - -/* protocol family dependent informations */ -struct afinfo { - /* protocol family */ - int family; - - /* prefix of library name (ex "libipt_" */ - char *libprefix; - - /* used by setsockopt (ex IPPROTO_IP */ - int ipproto; - - /* kernel module (ex "ip_tables" */ - char *kmod; - - /* optname to check revision support of match */ - int so_rev_match; - - /* optname to check revision support of match */ - int so_rev_target; -}; - -enum xt_tryload { - DONT_LOAD, - DURING_LOAD, - TRY_LOAD, - LOAD_MUST_SUCCEED -}; - -struct xtables_rule_match { - struct xtables_rule_match *next; - struct xtables_match *match; - /* Multiple matches of the same type: the ones before - the current one are completed from parsing point of view */ - unsigned int completed; -}; - -extern char *lib_dir; - -extern void *fw_calloc(size_t count, size_t size); -extern void *fw_malloc(size_t size); - -extern const char *modprobe_program; -extern int xtables_insmod(const char *modname, const char *modprobe, int quiet); -extern int load_xtables_ko(const char *modprobe, int quiet); - -/* This is decleared in ip[6]tables.c */ -extern struct afinfo afinfo; - -/* Keeping track of external matches and targets: linked lists. */ -extern struct xtables_match *xtables_matches; -extern struct xtables_target *xtables_targets; +/* $Id$ + * ipac-ng v.1.34 + * Part of this code taken from iptables 1.4.9.1 + */ +#ifndef IPTABLES_INTERNAL_H +#define IPTABLES_INTERNAL_H 1 -extern struct xtables_match *find_match(const char *name, enum xt_tryload, - struct xtables_rule_match **match); -extern struct xtables_target *find_target(const char *name, enum xt_tryload); +#define IPTABLES_VERSION "1.4.9.1" -extern void _init(void); +#endif /* IPTABLES_INTERNAL_H */ -#endif /* _XTABLES_INTERNAL_H */ |
From: Friedrich L. <fr...@us...> - 2010-09-05 18:56:09
|
Update of /cvsroot/ipac-ng/docs/developer In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24585 Modified Files: new-developer.txt Log Message: apparently link to SSH key management page changed over time Index: new-developer.txt =================================================================== RCS file: /cvsroot/ipac-ng/docs/developer/new-developer.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- new-developer.txt 5 Sep 2010 18:50:11 -0000 1.3 +++ new-developer.txt 5 Sep 2010 18:56:02 -0000 1.4 @@ -5,8 +5,8 @@ account you will be doing your development at. Hit enter till you are back at the prompt. - * Go to http://sourceforge.net/account/editsshkeys.php (might need - to log in to SF first if you are not prompted for your password) + * Go to https://sourceforge.net/account/ssh (might need to log in + to SF first if you are not prompted for your password) * Run "cat ~/.ssh/id_rsa.pub" and copy-and-paste this into the text box on the page referenced above and click "Update" below the box. |
From: Friedrich L. <fr...@us...> - 2010-09-05 18:50:19
|
Update of /cvsroot/ipac-ng/docs/developer In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv23215 Modified Files: new-developer.txt Log Message: updated CVS URL Index: new-developer.txt =================================================================== RCS file: /cvsroot/ipac-ng/docs/developer/new-developer.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- new-developer.txt 6 Mar 2004 19:43:29 -0000 1.2 +++ new-developer.txt 5 Sep 2010 18:50:11 -0000 1.3 @@ -33,7 +33,7 @@ "~/.alias": alias cvs_ipac='cvs -z3 \ - -d:ext:${SFUSER}@cvs.sourceforge.net:/cvsroot/ipac-ng' + -d:ext:${SFUSER}@ipac-ng.cvs.sourceforge.net:/cvsroot/ipac-ng' * Let's test this right aways. So either login again or open a new "konsole" (if you use KDE) or a new shell. |
From: Friedrich L. <fr...@us...> - 2009-07-30 22:52:11
|
Update of /cvsroot/ipac-ng/docs/admin In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv15762/admin Modified Files: developer-status.txt Log Message: added Mark Weaver <md...@us...> as project admin Index: developer-status.txt =================================================================== RCS file: /cvsroot/ipac-ng/docs/admin/developer-status.txt,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- developer-status.txt 6 Feb 2008 00:38:14 -0000 1.5 +++ developer-status.txt 30 Jul 2009 22:51:58 -0000 1.6 @@ -5,7 +5,7 @@ ----------+----------------------+-----------------------+-------------------------- Project | all rights | Al Zaharov | kaiser13 Admins | | Friedrich Lobenstock | friedl - | | | + | | Mark Weaver | mdw21 ----------+----------------------+-----------------------+-------------------------- Developer | checkout from latest | Simon Hausmann | hausmann | CVS, no commit | | |
From: Friedrich L. <fr...@us...> - 2008-02-06 00:48:36
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv18825 Modified Files: CHANGELOG Log Message: added Mark Spieths acronym Index: CHANGELOG =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/CHANGELOG,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- CHANGELOG 6 Feb 2005 01:29:29 -0000 1.32 +++ CHANGELOG 6 Feb 2008 00:48:37 -0000 1.33 @@ -11,6 +11,7 @@ # current developers: # kaiser13/az ......... Al Zakharov <kaiser13 at users dot sourceforge dot net> # friedl/fl ........... Friedrich Lobenstock <fl at fl dot priv dot at> +# mpoos ............... Mark Spieth <mpoos at users dot sourceforge dot net> # # contributors: # Thomas Zehetbauer <thomasz at hostmaster dot org> |
From: Friedrich L. <fr...@us...> - 2008-02-06 00:38:11
|
Update of /cvsroot/ipac-ng/docs/admin In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15563 Modified Files: developer-status.txt Log Message: added Mark Spieth as senior developer Index: developer-status.txt =================================================================== RCS file: /cvsroot/ipac-ng/docs/admin/developer-status.txt,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- developer-status.txt 6 Mar 2004 20:02:16 -0000 1.4 +++ developer-status.txt 6 Feb 2008 00:38:14 -0000 1.5 @@ -11,7 +11,7 @@ | CVS, no commit | | | | | ----------+----------------------+-----------------------+-------------------------- -Senior | +commit | | +Senior | +commit | Mark Spieth | mpoos Developer | | | | | | ----------+----------------------+-----------------------+-------------------------- |
From: Friedrich L. <fr...@us...> - 2008-02-06 00:21:40
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv8453 Modified Files: fetchipac.c Log Message: added a memory optimization when using the mysql backend Index: fetchipac.c =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- fetchipac.c 24 Aug 2004 18:38:56 -0000 1.20 +++ fetchipac.c 6 Feb 2008 00:21:18 -0000 1.21 @@ -432,8 +432,11 @@ else timestamp_e = 0; - if (timestamp_e && !strcmp(storage_method->name, "postgre")) { - /* for postgres storage and query for a timestamp range + if (timestamp_e + && (!strcmp(storage_method->name, "postgre") || + !strcmp(storage_method->name, "mysql") + ) { + /* for postgres/mysql storage and query for a timestamp range do some memory optimizations */ cnt = storage_method->list_timestamps(timestamp_b, timestamp_e, &tlist, NULL, NULL, NULL); |
From: Friedrich L. <fr...@us...> - 2005-02-06 01:35:45
|
Update of /cvsroot/ipac-ng/ipac-ng In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22580 Modified Files: fetchipac.8 ipac-convert.8 ipacsum ipacsum.8 Log Message: increase version to 1.32 Index: ipac-convert.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipac-convert.8,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ipac-convert.8 28 Jun 2004 15:47:24 -0000 1.7 +++ ipac-convert.8 6 Feb 2005 01:35:35 -0000 1.8 @@ -76,7 +76,7 @@ If the source database is corrupted, results are undefined. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.31. +This man page belongs to ipac version 1.32. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng Index: ipacsum =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- ipacsum 6 Feb 2005 00:35:04 -0000 1.18 +++ ipacsum 6 Feb 2005 01:35:35 -0000 1.19 @@ -52,7 +52,7 @@ # =()<$datdelim="@<DATDELIM>@";>()= $datdelim="#-#-#-#-#"; # =()<$version="@<VERSION>@";>()= -$version="1.31"; +$version="1.32"; # =()<$prefix="@<prefix>@";>()= $prefix="/usr"; # =()<$exec_prefix="@<exec_prefix>@";>()= Index: fetchipac.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/fetchipac.8,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- fetchipac.8 24 Aug 2004 18:38:56 -0000 1.9 +++ fetchipac.8 6 Feb 2005 01:35:35 -0000 1.10 @@ -339,7 +339,7 @@ to use ipchains with 2.4.* kernels!) .SH VERSION .\" =()<This man page belongs to ipac-ng version @<VERSION>@.>()= -This man page belongs to ipac-ng version 1.31. +This man page belongs to ipac-ng version 1.32. For updates and other information, look at .B http://sf.net/projects/ipac-ng Index: ipacsum.8 =================================================================== RCS file: /cvsroot/ipac-ng/ipac-ng/ipacsum.8,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ipacsum.8 28 Jun 2004 15:47:24 -0000 1.7 +++ ipacsum.8 6 Feb 2005 01:35:35 -0000 1.8 @@ -414,7 +414,7 @@ very well and the output is ugly. Use --png instead. .SH VERSION .\" =()<This man page belongs to ipac version @<VERSION>@.>()= -This man page belongs to ipac version 1.31. +This man page belongs to ipac version 1.32. For updates and other information, look at .B http://sourceforge.net/projects/ipac-ng |