working

.gitignore

@@ -17,3 +17,7 @@
 *.app
 .*
 *~
+
+config.h
+*.log
+build.conf

Install-Ntk-Debug.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-make clean
-autoreconf -i
-CFLAGS="-g" "-std=c99" ./configure
-make
-sudo make install

Makefile.am

@@ -1 +0,0 @@
-SUBDIRS = src

Makefile.in

@@ -1,560 +0,0 @@
-# Makefile.in generated by automake 1.8.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-	ChangeLog INSTALL NEWS TODO config.guess config.sub depcomp \
-	install-sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(mkdir_p)
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_DIR = @CONF_DIR@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_DIR = @DATA_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-IF_METHOD = @IF_METHOD@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-OTHER_METHOD = @OTHER_METHOD@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PID_DIR = @PID_DIR@
-RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-debug_flags = @debug_flags@
-exec_prefix = @exec_prefix@
-gmp = @gmp@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-SUBDIRS = src
-all: all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
-	      cd $(srcdir) && $(AUTOMAKE) --gnu  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-uninstall-info-am:
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $$MAKEFLAGS; amf=$$2; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/src/conf
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || mkdir "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="../$(top_distdir)" \
-	        distdir="../$(distdir)/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile
-installdirs: installdirs-recursive
-installdirs-am:
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-recursive ctags \
-	ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
-	dist-tarZ dist-zip distcheck distclean distclean-generic \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

SConstruct

@@ -0,0 +1,54 @@
+import os
+import sys
+import platform as _platform
+
+#
+#   Command line options and help
+#
+
+opts = Variables('build.conf')
+opts.AddVariables(('CONF_DIR', """Directory where the Netsukuku configuration files will be installed""", '/etc/netsukuku'),
+        ('DATA_DIR', 'Directory to install data files', '/usr/share/netsukuku'),
+        ('MAN_DIR',  'Where the manuals will be installed', '/usr/man'),
+        ('BIN_DIR' , 'Directory to install the binaries', '/usr/bin'),
+        ('PID_DIR',  'Specify location of ntkd.pid file', '/var/run'),
+        ('destdir', 'SCons will copy all the files under destdir during installation', '/'),
+        EnumVariable('debug', 'build the debug code', 'no',
+            allowed_values=('yes', 'no', '1', '0'), map={},
+            ignorecase=0),
+        EnumVariable('static', 'build statically the binaries', 'no',
+            allowed_values=('yes', 'no', '1', '0'), map={},
+            ignorecase=0))
+opts.Add('CC', 'The C compiler.')
+opts.Add('CXX', 'The C++ compiler.')
+
+env = Environment(options = opts, ENV = os.environ, CCFLAGS = ' -Wall')
+
+env['platform'] = _platform.system().lower();
+env["CC"] = os.getenv("CC") or env["CC"]
+env["CXX"] = os.getenv("CXX") or env["CXX"]
+env["ENV"].update(x for x in os.environ.items() if x[0].startswith("CCC_"))
+
+env.Append(CPPPATH = ['#src'])
+env.Append(LIBPATH = ['#src'])
+env.Append(CFLAGS = ['-g'])
+
+opts.Save('build.conf', env)
+
+Help("""
+*** Usage
+      'scons' to build the ntkd binary,
+      'scons debug=yes' to build the debug version.
+      'scons install' to install it in the system.
+
+*** General options
+""" + opts.GenerateHelpText(env))
+
+print "===================================================="
+print "Compiling Netsukuku for " + env['platform']
+print "===================================================="
+
+Export("env")
+
+# Main Sources
+SConscript("#src/SConscript")

aclocal.m4

@@ -1,932 +0,0 @@
-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-#                                                        -*- Autoconf -*-
-# Copyright (C) 2002, 2003  Free Software Foundation, Inc.
-# Generated from amversion.in; do not edit by hand.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.8.5])])
-
-# AM_AUX_DIR_EXPAND
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                              -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 6
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.])
-fi])])
-
-# serial 7						-*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.   -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-#serial 2
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
-  # Extract the definition of DEP_FILES from the Makefile without
-  # running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
-  # We invoke sed twice because it is the simplest approach to
-  # changing $(DEPDIR) to its actual value in the expansion.
-  for file in `sed -n '
-    /^DEP_FILES = .*\\\\$/ {
-      s/^DEP_FILES = //
-      :loop
-	s/\\\\$//
-	p
-	n
-	/\\\\$/ b loop
-      p
-    }
-    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 7
-
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-
-# Do all the work for Automake.                            -*- Autoconf -*-
-
-# This macro actually does too much some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 11
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_MISSING_PROG(AMTAR, tar)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-#                                                          -*- Autoconf -*-
-# Copyright (C) 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 1
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-#  -*- Autoconf -*-
-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-
-# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # Keeping the `.' argument allows $(mkdir_p) to be used without
-  # argument.  Indeed, we sometimes output rules like
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.
-  # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more
-  # expensive solution, as it forces Make to start a sub-shell.)
-  mkdir_p='mkdir -p -- .'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                    -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003  Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 2
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# serial 3
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# AM_PROG_INSTALL_STRIP
-
-# Copyright (C) 2001, 2003 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-

configure.ac

@@ -1,184 +0,0 @@
-AC_PREREQ(2.59)
-AC_INIT(netsukuku, 0.0.9b)
-AM_INIT_AUTOMAKE(netsukuku, 0.0.9b)
-AC_DEFINE(VERSION, 0.0.9b)
-AM_CONFIG_HEADER(src/config.h) 
-
-dnl -----------------------------------
-dnl Get hostname and other information.
-dnl -----------------------------------
-AC_CANONICAL_HOST
-
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXX
-
-prefix=/usr
-datadir=/usr/share/netsukuku
-sysconfdir=/etc/netsukuku
-piddir=/var/run
-
-AC_ARG_WITH(gmp-include, AS_HELP_STRING([--with-gmp-include], \
-[gmp include dir]), [gmp="$withval"])
-AC_SUBST(gmp)
-
-
-AC_HEADER_STDC
-AC_CHECK_HEADERS([unistd.h])
-
-AC_CHECK_HEADERS([pthread.h], ,\
-        [echo "============================ Unable to find pthread.h"; \
-         echo "Do you have the libpthread library installed?" ])
-AC_CHECK_HEADERS([zlib.h], ,\
-        [echo "============================ Unable to find zlib.h"; \
-         echo "Do you have the zlib library installed?" ])
-AC_CHECK_HEADERS([openssl/crypto.h], ,\
-        [echo "============================ Unable to find openssl/crypto.h";\
-         echo "Read README first!!!!!"; \
-         echo "Install the openssl library"])
-AC_CHECK_HEADERS([gmp.h], ,\
-        [echo "============================ Unable to find gmp.h"; \
-         echo "Read README first!!!!!"; \
-         echo "You need to install the libgmp library."; \
-         echo "In the debian the package is libgmp3-dev"])
-
-AC_MSG_CHECKING(OS)
-case "$host" in
-  *-sunos5.6* | *-solaris2.6*)
-      opsys=sol2-6
-      AC_DEFINE(SUNOS,,SunOS 5)
-      AC_CHECK_LIB(xnet, main)
-      AC_MSG_RESULT(solaris)
-  ;;
-  *-sunos5* | *-solaris2*)
-      AC_DEFINE(SUNOS,,SunOS 5)
-      AC_CHECK_LIB(socket, main)
-      AC_CHECK_LIB(nsl, main)
-      AC_MSG_RESULT(solaris)
-  ;;
-  *-linux-*)
-      opsys=gnu-linux
-      AC_DEFINE(GNU_LINUX,,GNU Linux)
-      AC_MSG_RESULT(linux)
-  ;;
-  *-nec-sysv4*)
-      AC_CHECK_LIB(nsl, gethostbyname)
-      AC_CHECK_LIB(socket, socket)
-      AC_MSG_RESULT(net-sysv4)
-  ;;
-  *-freebsd*)
-      AC_DEFINE(FREEBSD,,FreeBSD)
-      AC_MSG_RESULT(freebsd)
-  ;;
-  *-openbsd*)
-      opsys=openbsd
-      AC_DEFINE(OPEN_BSD,,OpenBSD)
-      AC_MSG_RESULT(openbsd)
-  ;;
-  *-bsdi*)
-      opsys=bsdi
-      OTHER_METHOD="mtu_kvm.o"
-      AC_CHECK_LIB(kvm, main)
-      AC_MSG_RESULT(bsdi)
-  ;;
-  *-irix6.5)
-      opsys=irix
-      AC_DEFINE(IRIX,,IRIX 6.5)
-      AC_MSG_RESULT(irix)
-  ;;
-esac
-
-dnl ------------------------------------
-dnl Determine routing get and set method
-dnl ------------------------------------
-AC_MSG_CHECKING(Netsukuku kernel interface method)
-if test x"$opsys" = x"gnu-linux"; then
-    AC_MSG_RESULT(netlink)
-    RT_METHOD=rt_netlink.o
-    AC_DEFINE(HAVE_NETLINK,,netlink)
-    netlink=yes
-else
-  if test "$opsys" = "sol2-6";then
-    AC_MSG_RESULT(solaris)
-    KERNEL_METHOD="kernel_socket.o"
-    RT_METHOD="rt_socket.o"
-  elif test "$opsys" = "irix" ; then
-    AC_MSG_RESULT(irix)
-    KERNEL_METHOD="kernel_socket.o"
-    RT_METHOD="rt_socket.o"
-  else
-    AC_TRY_RUN([#include <errno.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-
-main ()
-{
-  int ac_sock;
-
-  ac_sock = socket (AF_ROUTE, SOCK_RAW, 0);
-  if (ac_sock < 0 && errno == EINVAL)
-    exit (1);
-  exit (0);
-}],
-  [KERNEL_METHOD=kernel_socket.o
-   RT_METHOD=rt_socket.o
-   AC_MSG_RESULT(socket)],
-  [RT_METHOD=rt_ioctl.o
-   AC_MSG_RESULT(ioctl)],
-  [KERNEL_METHOD=kernel_socket.o
-   RT_METHOD=rt_socket.o
-   AC_MSG_RESULT(socket)])
-  fi
-fi
-AC_SUBST(RT_METHOD)
-AC_SUBST(KERNEL_METHOD)
-AC_SUBST(OTHER_METHOD)
-
-
-dnl -----------------------------
-dnl check interface lookup method
-dnl -----------------------------
-AC_MSG_CHECKING(interface looking up method)
-if test "$netlink" = yes; then
-  AC_MSG_RESULT(netlink)
-  IF_METHOD=if_netlink.o
-else
-  if test "$opsys" = "sol2-6";then
-    AC_MSG_RESULT(solaris)
-    IF_METHOD=if_ioctl.o
-  elif test "$opsys" = "irix" ; then
-    AC_MSG_RESULT(irix)
-     IF_METHOD=if_ioctl.o
-  elif test "$opsys" = "openbsd";then
-    AC_MSG_RESULT(openbsd)
-    IF_METHOD=if_ioctl.o
-  elif grep NET_RT_IFLIST /usr/include/sys/socket.h >/dev/null 2>&1; then
-    AC_MSG_RESULT(sysctl)
-    IF_METHOD=if_sysctl.o
-    AC_DEFINE(HAVE_NET_RT_IFLIST,,NET_RT_IFLIST)
-  else
-    AC_MSG_RESULT(ioctl)
-    IF_METHOD=if_ioctl.o
-  fi
-fi
-AC_SUBST(IF_METHOD)
-
-
-
-AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug], [Enable Netsukuku debug]),\
-[debug_flags="-Wall -DDEBUG"], [debug_flags=""])
-AC_SUBST(debug_flags)
-
-AC_DEFINE_UNQUOTED(DATA_DIR, "$datadir", "Where the Netsukuku data is saved")
-AC_DEFINE_UNQUOTED(CONF_DIR, "$sysconfdir", "Location of configuration files")
-AC_DEFINE_UNQUOTED(PID_DIR, "$piddir", "Location of ntkd.pid file")
-AC_ARG_WITH(pid_dir, 
-	    [  --with-pid-dir=ARG      Specify location of ntkd.pid file (default /var/run)],\
-	    [AC_DEFINE_UNQUOTED(PID_DIR, "$withval", ntkd.pid file location)])
-AC_SUBST(CONF_DIR)
-AC_SUBST(DATA_DIR)
-AC_SUBST(PID_DIR)
-
-AC_CONFIG_FILES([Makefile src/Makefile src/man/Makefile src/scripts/Makefile\
-		  src/conf/Makefile src/conf/netsukuku.conf])
-AC_OUTPUT

depcomp

@@ -1,530 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-07-09.11
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

install-sh

@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-05-14.22
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

missing

@@ -1,360 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-06-08.21
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    # If the file does not exist, the user really needs makeinfo;
-    # let's fail without touching anything.
-    test -f $file || exit 1
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:

src/Makefile.am

@@ -1,21 +0,0 @@
-SUBDIRS = man scripts conf
-
-AM_CFLAGS= -g -I. @debug_flags@ -I@gmp@
-AM_CXXFLAGS = -g -I. @debug_flags@ -I@gmp@
-
-bin_PROGRAMS = ntkd ntk-resolv
-ntkd_SOURCES = accept.c map.c misc.c buffer.c hash.c pkts.c qspn.c   \
-	request.c  \
-	radar.c gmap.c hook.c rehook.c if.c inet.c ipv6-gmp.c        \
-	krnl_route.c andna.c snsd_cache.c andna_cache.c err_errno.c  \
-	andns.c andns_lib.c dnslib.c andns_net.c andns_snsd.c	     \
-	bmap.c  conf.c crypto.c daemon.c dns_wrapper.c endianness.c  \
-	krnl_rule.c iptunnel.c libnetlink.c ll_map.c llist.c log.c   \
-	route.c tracer.c igs.c libping.c xmalloc.c netsukuku.c       \
-	mark.c libiptc/libip4tc.c
-ntkd_LDADD = -lpthread -lgmp -lcrypto -lresolv -lz
-
-ntk_resolv_SOURCES = andns_lib.c ntkresolv.c andns_net.c crypto.c    \
-		  snsd_cache.c inet.c ll_map.c libnetlink.c log.c    \
-		  xmalloc.c endianness.c misc.c err_errno.c buffer.c
-ntk_resolv_LDADD = -lz -lcrypto

src/Makefile.in

@@ -1,809 +0,0 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-bin_PROGRAMS = ntkd$(EXEEXT) ntk-resolv$(EXEEXT)
-subdir = src
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/config.h.in $(top_srcdir)/depcomp TODO
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
-am_ntk_resolv_OBJECTS = andns_lib.$(OBJEXT) ntkresolv.$(OBJEXT) \
-	andns_net.$(OBJEXT) crypto.$(OBJEXT) snsd_cache.$(OBJEXT) \
-	inet.$(OBJEXT) ll_map.$(OBJEXT) libnetlink.$(OBJEXT) \
-	log.$(OBJEXT) xmalloc.$(OBJEXT) endianness.$(OBJEXT) \
-	misc.$(OBJEXT) err_errno.$(OBJEXT) buffer.$(OBJEXT)
-ntk_resolv_OBJECTS = $(am_ntk_resolv_OBJECTS)
-ntk_resolv_DEPENDENCIES =
-am_ntkd_OBJECTS = accept.$(OBJEXT) map.$(OBJEXT) misc.$(OBJEXT) \
-	buffer.$(OBJEXT) hash.$(OBJEXT) pkts.$(OBJEXT) qspn.$(OBJEXT) \
-	request.$(OBJEXT) radar.$(OBJEXT) gmap.$(OBJEXT) \
-	hook.$(OBJEXT) rehook.$(OBJEXT) if.$(OBJEXT) inet.$(OBJEXT) \
-	ipv6-gmp.$(OBJEXT) krnl_route.$(OBJEXT) andna.$(OBJEXT) \
-	snsd_cache.$(OBJEXT) andna_cache.$(OBJEXT) err_errno.$(OBJEXT) \
-	andns.$(OBJEXT) andns_lib.$(OBJEXT) dnslib.$(OBJEXT) \
-	andns_net.$(OBJEXT) andns_snsd.$(OBJEXT) bmap.$(OBJEXT) \
-	conf.$(OBJEXT) crypto.$(OBJEXT) daemon.$(OBJEXT) \
-	dns_wrapper.$(OBJEXT) endianness.$(OBJEXT) krnl_rule.$(OBJEXT) \
-	iptunnel.$(OBJEXT) libnetlink.$(OBJEXT) ll_map.$(OBJEXT) \
-	llist.$(OBJEXT) log.$(OBJEXT) route.$(OBJEXT) tracer.$(OBJEXT) \
-	igs.$(OBJEXT) libping.$(OBJEXT) xmalloc.$(OBJEXT) \
-	netsukuku.$(OBJEXT) mark.$(OBJEXT) libip4tc.$(OBJEXT)
-ntkd_OBJECTS = $(am_ntkd_OBJECTS)
-ntkd_DEPENDENCIES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-DEFAULT_INCLUDES = -I.@am__isrc@
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-am__mv = mv -f
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-AM_V_CC = $(am__v_CC_@AM_V@)
-am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
-am__v_CC_0 = @echo "  CC      " $@;
-am__v_CC_1 = 
-CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-AM_V_CCLD = $(am__v_CCLD_@AM_V@)
-am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
-am__v_CCLD_0 = @echo "  CCLD    " $@;
-am__v_CCLD_1 = 
-SOURCES = $(ntk_resolv_SOURCES) $(ntkd_SOURCES)
-DIST_SOURCES = $(ntk_resolv_SOURCES) $(ntkd_SOURCES)
-RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
-	ctags-recursive dvi-recursive html-recursive info-recursive \
-	install-data-recursive install-dvi-recursive \
-	install-exec-recursive install-html-recursive \
-	install-info-recursive install-pdf-recursive \
-	install-ps-recursive install-recursive installcheck-recursive \
-	installdirs-recursive pdf-recursive ps-recursive \
-	tags-recursive uninstall-recursive
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-  distclean-recursive maintainer-clean-recursive
-am__recursive_targets = \
-  $(RECURSIVE_TARGETS) \
-  $(RECURSIVE_CLEAN_TARGETS) \
-  $(am__extra_recursive_targets)
-AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
-	$(LISP)config.h.in
-# Read a list of newline-separated strings from the standard input,
-# and print each of them once, without duplicates.  Input order is
-# *not* preserved.
-am__uniquify_input = $(AWK) '\
-  BEGIN { nonempty = 0; } \
-  { items[$$0] = 1; nonempty = 1; } \
-  END { if (nonempty) { for (i in items) print i; }; } \
-'
-# Make sure the list of sources is unique.  This is necessary because,
-# e.g., the same source file might be shared among _SOURCES variables
-# for different programs/libraries.
-am__define_uniq_tagged_files = \
-  list='$(am__tagged_files)'; \
-  unique=`for i in $$list; do \
-    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-  done | $(am__uniquify_input)`
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-am__relativize = \
-  dir0=`pwd`; \
-  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-  sed_rest='s,^[^/]*/*,,'; \
-  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-  sed_butlast='s,/*[^/]*$$,,'; \
-  while test -n "$$dir1"; do \
-    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-    if test "$$first" != "."; then \
-      if test "$$first" = ".."; then \
-        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-      else \
-        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-        if test "$$first2" = "$$first"; then \
-          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-        else \
-          dir2="../$$dir2"; \
-        fi; \
-        dir0="$$dir0"/"$$first"; \
-      fi; \
-    fi; \
-    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-  done; \
-  reldir="$$dir2"
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_DIR = @CONF_DIR@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_DIR = @DATA_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-IF_METHOD = @IF_METHOD@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-OTHER_METHOD = @OTHER_METHOD@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PID_DIR = @PID_DIR@
-RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-debug_flags = @debug_flags@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gmp = @gmp@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-SUBDIRS = man scripts conf
-AM_CFLAGS = -g -I. @debug_flags@ -I@gmp@
-AM_CXXFLAGS = -g -I. @debug_flags@ -I@gmp@
-ntkd_SOURCES = accept.c map.c misc.c buffer.c hash.c pkts.c qspn.c   \
-	request.c  \
-	radar.c gmap.c hook.c rehook.c if.c inet.c ipv6-gmp.c        \
-	krnl_route.c andna.c snsd_cache.c andna_cache.c err_errno.c  \
-	andns.c andns_lib.c dnslib.c andns_net.c andns_snsd.c	     \
-	bmap.c  conf.c crypto.c daemon.c dns_wrapper.c endianness.c  \
-	krnl_rule.c iptunnel.c libnetlink.c ll_map.c llist.c log.c   \
-	route.c tracer.c igs.c libping.c xmalloc.c netsukuku.c       \
-	mark.c libiptc/libip4tc.c
-
-ntkd_LDADD = -lpthread -lgmp -lcrypto -lresolv -lz
-ntk_resolv_SOURCES = andns_lib.c ntkresolv.c andns_net.c crypto.c    \
-		  snsd_cache.c inet.c ll_map.c libnetlink.c log.c    \
-		  xmalloc.c endianness.c misc.c err_errno.c buffer.c
-
-ntk_resolv_LDADD = -lz -lcrypto
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-.SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-
-config.h: stamp-h1
-	@if test ! -f $@; then rm -f stamp-h1; else :; fi
-	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status src/config.h
-$(srcdir)/config.h.in:  $(am__configure_deps) 
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-install-binPROGRAMS: $(bin_PROGRAMS)
-	@$(NORMAL_INSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
-	fi; \
-	for p in $$list; do echo "$$p $$p"; done | \
-	sed 's/$(EXEEXT)$$//' | \
-	while read p p1; do if test -f $$p \
-	  ; then echo "$$p"; echo "$$p"; else :; fi; \
-	done | \
-	sed -e 'p;s,.*/,,;n;h' \
-	    -e 's|.*|.|' \
-	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-	sed 'N;N;N;s,\n, ,g' | \
-	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-	    else { print "f", $$3 "/" $$4, $$1; } } \
-	  END { for (d in files) print "f", d, files[d] }' | \
-	while read type dir files; do \
-	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-	    test -z "$$files" || { \
-	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-	    } \
-	; done
-
-uninstall-binPROGRAMS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-	files=`for p in $$list; do echo "$$p"; done | \
-	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-	      -e 's/$$/$(EXEEXT)/' \
-	`; \
-	test -n "$$list" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-ntk-resolv$(EXEEXT): $(ntk_resolv_OBJECTS) $(ntk_resolv_DEPENDENCIES) $(EXTRA_ntk_resolv_DEPENDENCIES) 
-	@rm -f ntk-resolv$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(ntk_resolv_OBJECTS) $(ntk_resolv_LDADD) $(LIBS)
-
-ntkd$(EXEEXT): $(ntkd_OBJECTS) $(ntkd_DEPENDENCIES) $(EXTRA_ntkd_DEPENDENCIES) 
-	@rm -f ntkd$(EXEEXT)
-	$(AM_V_CCLD)$(LINK) $(ntkd_OBJECTS) $(ntkd_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accept.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andna.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andna_cache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andns.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andns_lib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andns_net.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/andns_snsd.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/conf.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypto.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/daemon.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dns_wrapper.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dnslib.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/endianness.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/err_errno.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gmap.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hash.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hook.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/if.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/igs.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inet.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/iptunnel.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ipv6-gmp.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krnl_route.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/krnl_rule.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libip4tc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnetlink.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libping.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ll_map.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/llist.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/map.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mark.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/misc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/netsukuku.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntkresolv.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pkts.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qspn.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/radar.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rehook.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/request.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/route.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/snsd_cache.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tracer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-libip4tc.o: libiptc/libip4tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.o -MD -MP -MF $(DEPDIR)/libip4tc.Tpo -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libip4tc.Tpo $(DEPDIR)/libip4tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libiptc/libip4tc.c' object='libip4tc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.o `test -f 'libiptc/libip4tc.c' || echo '$(srcdir)/'`libiptc/libip4tc.c
-
-libip4tc.obj: libiptc/libip4tc.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libip4tc.obj -MD -MP -MF $(DEPDIR)/libip4tc.Tpo -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libip4tc.Tpo $(DEPDIR)/libip4tc.Po
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='libiptc/libip4tc.c' object='libip4tc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libip4tc.obj `if test -f 'libiptc/libip4tc.c'; then $(CYGPATH_W) 'libiptc/libip4tc.c'; else $(CYGPATH_W) '$(srcdir)/libiptc/libip4tc.c'; fi`
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run 'make' without going through this Makefile.
-# To change the values of 'make' variables: instead of editing Makefiles,
-# (1) if the variable is set in 'config.status', edit 'config.status'
-#     (which will cause the Makefiles to be regenerated when you run 'make');
-# (2) otherwise, pass the desired values on the 'make' command line.
-$(am__recursive_targets):
-	@fail=; \
-	if $(am__make_keepgoing); then \
-	  failcom='fail=yes'; \
-	else \
-	  failcom='exit 1'; \
-	fi; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-ID: $(am__tagged_files)
-	$(am__define_uniq_tagged_files); mkid -fID $$unique
-tags: tags-recursive
-TAGS: tags
-
-tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	set x; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	$(am__define_uniq_tagged_files); \
-	shift; \
-	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  if test $$# -gt 0; then \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      "$$@" $$unique; \
-	  else \
-	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	      $$unique; \
-	  fi; \
-	fi
-ctags: ctags-recursive
-
-CTAGS: ctags
-ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
-	$(am__define_uniq_tagged_files); \
-	test -z "$(CTAGS_ARGS)$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && $(am__cd) $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) "$$here"
-cscopelist: cscopelist-recursive
-
-cscopelist-am: $(am__tagged_files)
-	list='$(am__tagged_files)'; \
-	case "$(srcdir)" in \
-	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
-	  *) sdir=$(subdir)/$(srcdir) ;; \
-	esac; \
-	for i in $$list; do \
-	  if test -f "$$i"; then \
-	    echo "$(subdir)/$$i"; \
-	  else \
-	    echo "$$sdir/$$i"; \
-	  fi; \
-	done >> $(top_builddir)/cscope.files
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    $(am__make_dryrun) \
-	      || test -d "$(distdir)/$$subdir" \
-	      || $(MKDIR_P) "$(distdir)/$$subdir" \
-	      || exit 1; \
-	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-	    $(am__relativize); \
-	    new_distdir=$$reldir; \
-	    dir1=$$subdir; dir2="$(top_distdir)"; \
-	    $(am__relativize); \
-	    new_top_distdir=$$reldir; \
-	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-	    ($(am__cd) $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$new_top_distdir" \
-	        distdir="$$new_distdir" \
-		am__remove_distdir=: \
-		am__skip_length_check=: \
-		am__skip_mode_fix=: \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(PROGRAMS) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(bindir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-hdr distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-html-am:
-
-info: info-recursive
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-recursive
-
-install-dvi-am:
-
-install-exec-am: install-binPROGRAMS
-
-install-html: install-html-recursive
-
-install-html-am:
-
-install-info: install-info-recursive
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-recursive
-
-install-pdf-am:
-
-install-ps: install-ps-recursive
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-binPROGRAMS
-
-.MAKE: $(am__recursive_targets) all install-am install-strip
-
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-binPROGRAMS clean-generic cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-hdr distclean-tags distdir dvi dvi-am html html-am \
-	info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs installdirs-am \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

src/Ntk-Console/Makefile

@@ -1,14 +0,0 @@
-C=clang
-DEBUG=-g -fno-builtin -Wfatal-errors -pedantic -Wunreachable-code -Winline -Wredundant-decls -Wno-vla
-CFLAGS=-Wall ${DEBUG}
-SRCBIN=Netsukuku-Console
-
-all: ${SRCBIN}
-
-${SRCBIN}: Netsukuku-Console.o
-	${C} ${LDFLAGS} ${LIBS} $^ -o $@
-
-.PHONY: clean
-
-clean:
-	rm -f *.o ${SRCBIN}

src/Ntk-Console/Netsukuku-Console.c

@@ -1,322 +0,0 @@
-#include "Netsukuku-Console.h"
-
-char response[BUFFER_LENGTH];
-
-void usage();
-
-void clean_up();
-
-int validity_check(char *request) {
-    
-        if(strncmp(request,"help", (int)strlen(request))  == 0)
-            return 1;
-        
-        else if(strncmp(request,"uptime", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"kill", (int)strlen(request))  == 0)
-            return 2;
-        
-        else if(strncmp(request,"version", (int)strlen(request))  == 0)
-            return 3;
-        
-        else if(strncmp(request,"console_uptime", (int)strlen(request))  == 0)
-            return 4;
-        
-        else if(strlen(request) > BUFFER_LENGTH)
-            return 5;
-        
-        else if(strncmp(request,"inet_connected", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"cur_ifs", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"cur_ifs_n", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"cur_qspn_id", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"cur_ip", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"cur_node", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"ifs", (int)strlen(request))  == 0)
-            return 0;
-        
-        else if(strncmp(request,"ifs_n", (int)strlen(request))  == 0)
-            return 0;
-        
-        else {
-            printf("Incorrect or unreadable command, Please correct it.\n");
-            return -1;
-        }
-    
-    return -2;
-    
-}
-
-void response_cleanup(char response[BUFFER_LENGTH]) {
-    
-    char remove = 'a';
-
-    char* c;
-    char* pPosition;
-    while((pPosition = strchr(response, 'a')) != NULL)  {
-        if ((c = index(response, remove)) != NULL) {
-        size_t len_left = sizeof(response) - (c+1-response);
-        memmove(c, c+1, len_left);
-        }
-    }
-    printf("Sent and received Successfully!\n The Response was: %s", response);
-}
-
-/* Sends and receives to ntkd */
-void ntkd_request(char *request) {
-
-    int request_length;
-    
-            rc = connect(sockfd, (struct sockaddr *)&serveraddr, SUN_LEN(&serveraddr));
-                if (rc < 0) {
-                    perror("connect() failed");
-                    exit(-1);
-                }
-    
-    
-            request_length = (int)strlen(request);
-            memset(request, 'a', BUFFER_LENGTH - request_length);
-            rc = send(sockfd, request, sizeof(request), 0);
-            if (rc < 0) {
-                perror("send() failed");
-                exit(-1);
-            }
-
-            bytesReceived = 0;
-            while (bytesReceived < BUFFER_LENGTH) {
-                rc = recv(sockfd, & response[bytesReceived],
-                   BUFFER_LENGTH - bytesReceived, 0);
-                if (rc < 0) {
-                    perror("recv() failed");
-                    exit(-1);
-                }
-            else if (rc == 0) {
-                printf("The server closed the connection\n");
-                exit(-1);
-            }
-
-            /* Increment the number of bytes that have been received so far  */
-            bytesReceived += rc;        
-            }
-            response_cleanup(response);
-}
-
-void opensocket(void) {
-    
-    sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
-    if (sockfd < 0) {
-         perror("socket creation failed");
-         exit(-1);
-    }
-    
-    memset(&serveraddr, 0, sizeof(serveraddr));
-    serveraddr.sun_family = AF_UNIX;
-    strcpy(serveraddr.sun_path, SERVER_PATH);
-}
-
-void console_uptime(void) {
-    
-    int uptime_sec1;
-    int uptime_min1;
-    int uptime_hour1;
-    
-    int uptime_day1;
-    int uptime_month1;
-    int uptime_year1;
-    
-    time(&rawtime);
-    
-    timeinfo = localtime(&rawtime);
-    
-    uptime_sec1 = timeinfo->tm_sec;
-    uptime_min1 = timeinfo->tm_min;
-    uptime_hour1 = timeinfo->tm_hour;
-    
-    uptime_day1 = timeinfo->tm_mday;
-    uptime_month1 = timeinfo->tm_mon;
-    uptime_year1 = timeinfo->tm_year;
-    
-    uptime_sec1 -= uptime_sec;
-    uptime_min1 -= uptime_min;
-    uptime_hour1 -= uptime_hour;
-    
-    uptime_day1 -= uptime_day;
-    uptime_month1 -= uptime_month;
-    uptime_year1 -= uptime_year;
-    /* Checks if the date/time is negative,
-     * And makes it positive.
-     * e.g -11 is 1 because this is a signed variable
-     * at a modulus of 12. Thus after 12, It is -12
-     * which is zero, Every number after this is counting up
-     * to 12 again, Which is going to be 0 in this instance.
-     * -12 to 12 is 24 actual months.
-     * So -11 + 12 is 1, As it should be, And -12 + 12 is zero
-     * as it should be. The only difference is the modulus number,
-     * i.e: 12, 24, etc. */
-    if(uptime_month1 < 0)
-        uptime_month1 + 12;
-    if(uptime_day1 < 0)
-        uptime_day1 + 365;
-    if(uptime_hour1 < 0)
-        uptime_hour1 + 24;
-    if(uptime_min1 < 0)
-        uptime_min1 + 60;
-    if(uptime_sec1 < 0)
-        uptime_sec1 + 60;
-    /* Checks if the date/time is the modulus, And resets it to zero.
-     * e.g: 12 months is a year, Listing 12 months and one year
-     * is confusing,
-     * And implies that it has been two years. */
-    if(uptime_month1 == 12)
-        uptime_month1 = 0;
-    if(uptime_day1 == 365)
-        uptime_day1 = 0;
-    if(uptime_hour1 == 24)
-        uptime_hour1 = 0;
-    if(uptime_min1 == 60)
-        uptime_min1 = 0;
-    if(uptime_sec1 == 60)
-        uptime_sec1 = 0;
-    
-    printf("Total Uptime is: %i Year(s), %i Month(s), %i Day(s), %i Hour(s), %i Minute(s), %i Second(s)\n",uptime_year1, uptime_month1, uptime_day1, uptime_hour1, uptime_min1, uptime_sec1);
-    
-}
-
-int millisleep(unsigned ms)
-{
-  return usleep(1000 * ms);
-}
-
-void console(char * request) {
-    
-    if(validity_check(request) == -2)
-            printf("Error: Command has not been processed!\n");
-        
-    if(validity_check(request) == -1)
-            usage();
-        
-    if(strncmp(request,"quit", (int)strlen(request)) == 0) {
-            clean_up();
-            exit(0);
-        }
-    
-    if(validity_check(request) == 0) {
-            ntkd_request(request);
-            millisleep(200);
-    }
-        
-    if(validity_check(request) == 1)
-            usage();
-        
-    if(validity_check(request) == 2)
-            system("ntkd -k");
-        
-    if(validity_check(request) == 3) {
-            printf("Ntk-Console Version: %s\n", VERSION_STR);
-            ntkd_request(request);
-        }
-
-    if(validity_check(request) == 4)
-            console_uptime();
-    
-    if(validity_check(request) == 5)
-        printf("Error: Command longer than 250 bytes.\n");
-}
-
-int main(void) {
-    
-    time(&rawtime);
-    
-    timeinfo = localtime(&rawtime);
-    
-    uptime_sec = timeinfo->tm_sec;
-    uptime_min = timeinfo->tm_min;
-    uptime_hour = timeinfo->tm_hour;
-    uptime_day = timeinfo->tm_mday;
-    uptime_month = timeinfo->tm_mon;
-    uptime_year = timeinfo->tm_year;
-    
-    opensocket();
-    
-    printf("This is the Netsukuku Console, Please type 'help' for more information.\n");
-    
-    char request;
-
-    char request1;
-    
-    request = (char)malloc(BUFFER_LENGTH);
-    
-    request1 = (char)malloc(BUFFER_LENGTH);
-    
-    do {
-    
-    printf("\n>");
-        
-    fgets(request1, 16, stdin);
-    
-    fflush(stdin);
-    
-    request1 = request;
-    
-    console(request);
-    } while(FALSE);
-    
-clean_up(); 
-return 0;
-}
-
-void usage(void) {
-    
-    	printf("Usage\n"
-		" uptime    Returns the time when ntkd finished the hooking," 
-					  "to get the the actual uptime just do) "
-					  "time(0)-me.uptime \n"
-		" help	Shows this\n"
-		" kill	Kills the running instance of netsukuku with SIGINT\n\n"
-		" version   Shows the running version of the ntk-console, and ntkd.\n"
-		" inet_connected    If it is 1, Ntkd is connected to the Internet\n"
-		"\n"
-		" cur_ifs   Lists all of the interfaces in cur_ifs\n"
-		" cur_ifs_n Lists the number of interfaces present in `cur_ifs'\n"
-		"\n");
-        printf(" cur_qspn_id   The current qspn_id we are processing. "
-                                "It is cur_qspn_id[levels] big\n"
-		" cur_ip    Current IP address\n"
-		"\n"
-		" cur_node  Current Node\n"
-		" ifs   Lists all of the interfaces in server_opt.ifs\n"
-                " ifs_n Lists the number of interfaces present in server_opt.ifs\n"
-                " quit Exits this program\n"
-		" console_uptime    Gets the uptime of this console\n");
-    
-}
-
-void clean_up(void) {
-    
-    const int optVal = 1;
-    const socklen_t optLen = sizeof(optVal);
-    
-    setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (void*) &optVal, optLen);
-    setsockopt(sockfd1, SOL_SOCKET, SO_REUSEADDR, (void*) &optVal, optLen);
-    
-    if (sockfd != -1)
-        close(sockfd);
-
-    if (sockfd1 != -1)
-        close(sockfd1);
-   
-   unlink(SERVER_PATH);
-    
-}

src/Ntk-Console/Netsukuku-Console.h

@@ -1,36 +0,0 @@
-#ifndef NETSUKUKUCONSOLE_H
-#define NETSUKUKUCONSOLE_H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h> 
-#include <sys/socket.h>
-#include <utmp.h>
-#include <sys/un.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
-
-#define SERVER_PATH     "/tmp/ntk-console"
-#define BUFFER_LENGTH    250
-#define VERSION_STR     "0.0.2"
-#define FALSE              0
-
-int sockfd = -1, sockfd1 = -1;
-struct sockaddr_un serveraddr;
-int rc, bytesReceived;
-
-time_t rawtime;
-struct tm *timeinfo;
-
-int uptime_sec;
-int uptime_min;
-int uptime_hour;
-int uptime_day;
-int uptime_month;
-int uptime_year;
-
-int i;
-
-#endif /*NETSUKUKUCONSOLE_H*/

src/Ntk-Console/Ntk-Console-Compile.sh

@@ -1,3 +0,0 @@
-#!/bin/bash
-make clean
-make

src/SConstruct → src/SConscript

@@ -18,57 +18,35 @@
 import sys
 import os
 
+Import("env")
+
 NTK_VERSION="0.0.9b"
 
 #
 #	Sources and libs
 #
 
-sources_common    = Split('xmalloc.c log.c misc.c buffer.c endianness.c')
-sources_qspn      = Split('qspn-empiric.c') + sources_common
-sources_netsukuku = Split("""accept.c llist.c ipv6-gmp.c inet.c request.c map.c
-		   gmap.c bmap.c pkts.c radar.c hook.c rehook.c tracer.c qspn.c 
-		   hash.c daemon.c crypto.c snsd_cache.c
-		   andna_cache.c andna.c andns_lib.c err_errno.c
-		   dnslib.c andns.c andns_net.c andns_snsd.c
-		   ll_map.c libnetlink.c if.c krnl_route.c krnl_rule.c
-		   iptunnel.c route.c conf.c dns_wrapper.c igs.c mark.c 
-		   libiptc/libip4tc.c libping.c netsukuku.c""") + sources_common
-sources_ntkresolv = sources_common + Split("""andns_lib.c ntkresolv.c andns_net.c
-					      crypto.c snsd_cache.c inet.c
-					      ll_map.c libnetlink.c
-					      err_errno.c""") 
+sources_common    = ['xmalloc.c', 'log.c', 'misc.c', 'buffer.c', 'endianness.c']
+
+sources_qspn      = ['qspn-empiric.c'] + sources_common
+sources_netsukuku = ['accept.c', 'llist.c', 'ipv6-gmp.c', 'inet.c', 'request.c',
+					 'map.c', 'gmap.c', 'bmap.c', 'pkts.c', 'radar.c', 'hook.c',
+					 'rehook.c', 'tracer.c', 'qspn.c', 'hash.c', 'daemon.c',
+					 'crypto.c', 'snsd_cache.c', 'andna_cache.c', 'andna.c',
+					 'andns_lib.c', 'err_errno.c', 'dnslib.c', 'andns.c',
+					 'andns_net.c', 'andns_snsd.c', 'll_map.c', 'libnetlink.c',
+					 'if.c', 'krnl_route.c', 'krnl_rule.c', 'iptunnel.c',
+					 'route.c', 'conf.c', 'dns_wrapper.c', 'igs.c', 'mark.c',
+					 'libiptc/libip4tc.c', 'libping.c', 'ntk-console-server.c',
+					 'netsukuku.c'] + sources_common
+sources_ntkresolv = ['andns_lib.c', 'andns_net.c', 'crypto.c', 'snsd_cache.c',
+					 'inet.c', 'll_map.c', 'libnetlink.c', 'err_errno.c',
+					 'ntkresolv.c'] + sources_common
+
+sources_ntkconsole = ['ntk-console.c']
 
 libs = ['gmp', 'pthread', 'crypto', 'z']
 
-#
-#	Command line options and help
-#
-
-opts = Options('build.conf')
-opts.AddOptions(('CONF_DIR', """Directory where the Netsukuku configuration files will be installed""",
-				'/etc/netsukuku'),
-		('DATA_DIR', 'Directory to install data files',	
-				'/usr/share/netsukuku'),
-		('MAN_DIR',  'Where the manuals will be installed', 
-				'/usr/man'),
-		('BIN_DIR' , 'Directory to install the binaries',
-				'/usr/bin'),
-		('PID_DIR',  'Specify location of ntkd.pid file',
-				'/var/run'),
-		('destdir', 'SCons will copy all the files under destdir during installation',
-				'/'),
-		EnumOption('debug', 'build the debug code', 'no', 
-			allowed_values=('yes', 'no', '1', '0'), map={},
-			ignorecase=0),
-		EnumOption('static', 'build statically the binaries', 'no', 
-			allowed_values=('yes', 'no', '1', '0'), map={},
-			ignorecase=0))
-opts.Add('CC', 'The C compiler.')
-opts.Add('CXX', 'The C++ compiler.')
-
-env = Environment(options = opts, ENV = os.environ, CCFLAGS = ' -Wall')
-
 if ("yes" in env['debug']) or ("1" in env['debug']):
 	debug = 1
 	env.Append(CPPDEFINES={'DEBUG' : '${debug}'}, CCFLAGS = ' -ggdb -Wall', CXXFLAGS = '-g')
@@ -85,8 +63,6 @@ else:
 if (env['destdir'] == "/"):
 	env['destdir']=""
 
-opts.Save('build.conf', env)
-
 if os.path.exists("conf/netsukuku.conf") and env.GetOption('clean'):
 	Execute(Delete('conf/netsukuku.conf'))
 if os.path.exists("config.h") and env.GetOption('clean'):
@@ -94,15 +70,6 @@ if os.path.exists("config.h") and env.GetOption('clean'):
 if os.path.exists("config.log") and env.GetOption('clean'):
 	Execute(Delete('config.log'))
 	
-Help("""
-*** Usage
-      'scons' to build the ntkd binary,
-      'scons debug=yes' to build the debug version.
-      'scons install' to install it in the system.
-      
-*** General options
-""" + opts.GenerateHelpText(env))
-
 if ARGUMENTS.get('install'):
 		print "you aren't root"
 
@@ -145,10 +112,10 @@ if not os.path.exists("config.log") and not env.GetOption('clean'):
 
 def conf_build(target, source, env):
     conf_defines = {
-        "CONF_DIR": env["CONF_DIR"],
-	"DATA_DIR": env["DATA_DIR"],
-	"PID_DIR": env["PID_DIR"],
-	"VERSION": NTK_VERSION,
+		"CONF_DIR": env["CONF_DIR"],
+		"DATA_DIR": env["DATA_DIR"],
+		"PID_DIR": env["PID_DIR"],
+		"VERSION": NTK_VERSION,
         "debug": debug # this is an int.  1 for true, 0 for false
     }
 
@@ -187,11 +154,12 @@ build_config_files(env = env)
 #	Build
 #
 
-ntkd 	= env.Program('ntkd', sources_netsukuku, LIBS = libs, CPPPATH = '.')
-qspn    = env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
-ntkresolv = env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
+ntkd 		= env.Program('ntkd', sources_netsukuku, LIBS = libs, CPPPATH = '.')
+qspn  		= env.Program('qspn-empiric', sources_qspn, LIBS = libs, CPPPATH = '.')
+ntkresolv 	= env.Program('ntk-resolv', sources_ntkresolv, LIBS = libs, CPPPATH = '.')
+ntkconsole 	= env.Program('ntk-console', sources_ntkconsole, LIBS = libs, CPPPATH = '.', CFLAGS = '-std=c99')
 
-Default(ntkd, ntkresolv)
+Default(ntkd, ntkresolv, ntkconsole, qspn)
 
 
 #
@@ -208,6 +176,7 @@ idir_pid    = '$destdir' + '$PID_DIR'
 
 env.Install(idir_bin, [ntkd])
 env.Install(idir_bin, [ntkresolv])
+env.Install(idir_bin, [ntkconsole])
 env.Alias('install', [idir_bin, idir_conf])
 
 #Dirty hack ;( Why GetOption("install") doesn't work?

src/accept.c

@@ -35,170 +35,187 @@
 #include "log.h"
 
 
-void init_accept_tbl(int startups, int accepts, int time)
+void
+init_accept_tbl(int startups, int accepts, int time)
 {
 	/* TODO: activate and test it !! */
 #if 0
 	int i;
 
-	max_connections=startups;
-	max_accepts_per_host=accepts;
-	free_accept_time=time;
-	accept_idx=accept_sidx=0;
+	max_connections = startups;
+	max_accepts_per_host = accepts;
+	free_accept_time = time;
+	accept_idx = accept_sidx = 0;
 	pthread_mutex_init(&mtx_acpt_idx, NULL);
 	pthread_mutex_init(&mtx_acpt_sidx, NULL);
-	
-	accept_tbl=(struct accept_table *)xmalloc(sizeof(struct accept_table)*max_connections);
-	memset(accept_tbl, '\0', sizeof(struct accept_table)*max_connections);
-
-	for(i=0; i<max_connections; i++) {
-		accept_tbl[i].pid=(pid_t *)xmalloc(sizeof(pid_t)*max_accepts_per_host);
-		memset(accept_tbl[i].pid, '\0', sizeof(pid_t)*max_accepts_per_host);
-			
-		accept_tbl[i].closed=(unsigned char *)xmalloc(sizeof(unsigned char)*max_accepts_per_host);
-		memset(accept_tbl[i].closed, '\0', sizeof(unsigned char)*max_accepts_per_host);
-			
-		accept_tbl[i].acp_t=(time_t *)xmalloc(sizeof(time_t)*max_accepts_per_host);
-		memset(accept_tbl[i].acp_t, '\0', sizeof(time_t)*max_accepts_per_host);
+
+	accept_tbl =
+		(struct accept_table *) xmalloc(sizeof(struct accept_table) *
+										max_connections);
+	memset(accept_tbl, '\0',
+		   sizeof(struct accept_table) * max_connections);
+
+	for (i = 0; i < max_connections; i++) {
+		accept_tbl[i].pid =
+			(pid_t *) xmalloc(sizeof(pid_t) * max_accepts_per_host);
+		memset(accept_tbl[i].pid, '\0',
+			   sizeof(pid_t) * max_accepts_per_host);
+
+		accept_tbl[i].closed =
+			(unsigned char *) xmalloc(sizeof(unsigned char) *
+									  max_accepts_per_host);
+		memset(accept_tbl[i].closed, '\0',
+			   sizeof(unsigned char) * max_accepts_per_host);
+
+		accept_tbl[i].acp_t =
+			(time_t *) xmalloc(sizeof(time_t) * max_accepts_per_host);
+		memset(accept_tbl[i].acp_t, '\0',
+			   sizeof(time_t) * max_accepts_per_host);
 	}
 #endif
 }
 
-void destroy_accept_tbl(void)
+void
+destroy_accept_tbl(void)
 {
 	/* TODO: activate and test it !! */
 #if 0
-	int i; 
-	
-	if(!accept_tbl)
+	int i;
+
+	if (!accept_tbl)
 		return;
-	for(i=0; i<max_connections; i++) {
+	for (i = 0; i < max_connections; i++) {
 		xfree(accept_tbl[i].pid);
 		xfree(accept_tbl[i].closed);
 		xfree(accept_tbl[i].acp_t);
 	}
 	xfree(accept_tbl);
-	accept_tbl=0;
+	accept_tbl = 0;
 #endif
 }
 
 
-void update_accept_tbl(void)
+void
+update_accept_tbl(void)
 {
 	time_t cur_t, passed_time;
-	int i,e,k,ee, pid_exists;
-	
-	if(update_accept_tbl_mutex)
+	int i, e, k, ee, pid_exists;
+
+	if (update_accept_tbl_mutex)
 		return;
 	else
-		update_accept_tbl_mutex=1;
-	
+		update_accept_tbl_mutex = 1;
+
 	time(&cur_t);
-	
-	for(i=0; i < max_connections; i++) {
-		if(!accept_tbl[i].ip.len)
+
+	for (i = 0; i < max_connections; i++) {
+		if (!accept_tbl[i].ip.len)
 			continue;
-		if(accept_tbl[i].accepts) {
-			for(e=0; e<max_accepts_per_host; e++) {
-				if(!accept_tbl[i].acp_t[e])
+		if (accept_tbl[i].accepts) {
+			for (e = 0; e < max_accepts_per_host; e++) {
+				if (!accept_tbl[i].acp_t[e])
 					continue;
-				
-				if(accept_tbl[i].pid[e]) {
-					k=kill(accept_tbl[i].pid[e], 0);
-					pid_exists = !(k==-1 && errno==ESRCH);
+
+				if (accept_tbl[i].pid[e]) {
+					k = kill(accept_tbl[i].pid[e], 0);
+					pid_exists = !(k == -1 && errno == ESRCH);
 				} else
-					pid_exists=0;
+					pid_exists = 0;
 
 #if 0
 				debug(DBG_NOISE, "ACPT: Updating tbl: cur_t: %d, "
-						"accept_tbl[%d].acp_t[%d]:%d+%d, "
-						"accept_tbl[i].pid[e]: %d, "
-						"kill=%d (ESRCH=%d)",
-						cur_t, i,e, accept_tbl[i].acp_t[e], 
-						free_accept_time, accept_tbl[i].pid[e], 
-						k, ESRCH);
+					  "accept_tbl[%d].acp_t[%d]:%d+%d, "
+					  "accept_tbl[i].pid[e]: %d, "
+					  "kill=%d (ESRCH=%d)",
+					  cur_t, i, e, accept_tbl[i].acp_t[e],
+					  free_accept_time, accept_tbl[i].pid[e], k, ESRCH);
 #endif
 
-				passed_time=accept_tbl[i].acp_t[e]+free_accept_time;
-				if((accept_tbl[i].closed[e] || !pid_exists) && 
-						passed_time <= cur_t) {
-					ee=e;
+				passed_time = accept_tbl[i].acp_t[e] + free_accept_time;
+				if ((accept_tbl[i].closed[e] || !pid_exists) &&
+					passed_time <= cur_t) {
+					ee = e;
 					del_accept(i, &ee);
 				}
 			}
 		}
 	}
-	update_accept_tbl_mutex=0;
+	update_accept_tbl_mutex = 0;
 }
 
-int find_ip_acpt(inet_prefix ip)
+int
+find_ip_acpt(inet_prefix ip)
 {
 	int i;
-	
-	for(i=0; i<max_accepts_per_host; i++) {
-		if(!memcmp(accept_tbl[i].ip.data, &ip.data, MAX_IP_SZ))
+
+	for (i = 0; i < max_accepts_per_host; i++) {
+		if (!memcmp(accept_tbl[i].ip.data, &ip.data, MAX_IP_SZ))
 			return i;
 	}
 
 	return -1;
 }
 
-int find_first_free(void)
+int
+find_first_free(void)
 {
 	int i;
-	
-	for(i=0; i<max_connections; i++)
-		if(!accept_tbl[i].accepts)
+
+	for (i = 0; i < max_connections; i++)
+		if (!accept_tbl[i].accepts)
 			return i;
 	return -1;
 }
 
-int is_ip_acpt_free(inet_prefix ip, int *index)
+int
+is_ip_acpt_free(inet_prefix ip, int *index)
 {
 	int idx;
-	
+
 	update_accept_tbl();
-	
-	if((idx=find_ip_acpt(ip))==-1)
-		if((idx=find_first_free())==-1)
+
+	if ((idx = find_ip_acpt(ip)) == -1)
+		if ((idx = find_first_free()) == -1)
 			return E_TOO_MANY_CONN;
-	
+
 	/*debug(DBG_NOISE, "ACPT: accept_tbl[%d].accepts: %d, max_acp: %d", idx,
-			accept_tbl[idx].accepts, max_accepts_per_host); */
+	   accept_tbl[idx].accepts, max_accepts_per_host); */
 
-	if(accept_tbl[idx].accepts >= max_accepts_per_host)
+	if (accept_tbl[idx].accepts >= max_accepts_per_host)
 		return E_ACCEPT_TBL_FULL;
 
-	*index=idx;
+	*index = idx;
 	return 0;
 }
 
-int find_free_acp_t(int idx)
+int
+find_free_acp_t(int idx)
 {
 	int e;
-	
-	for(e=0; e < max_accepts_per_host; e++) {
-		if(!accept_tbl[idx].acp_t[e])
+
+	for (e = 0; e < max_accepts_per_host; e++) {
+		if (!accept_tbl[idx].acp_t[e])
 			return e;
 	}
-	
-	return -1;	/*This happens if the rq_tbl is full for the "rq" request*/
+
+	return -1;					/*This happens if the rq_tbl is full for the "rq" request */
 }
 
-int new_accept(int idx, inet_prefix ip)
+int
+new_accept(int idx, inet_prefix ip)
 {
-	int cl=0;
+	int cl = 0;
 	/* TODO: activate and test it !! */
 #if 0
 	time_t cur_t;
-	
+
 	time(&cur_t);
-	
-	if((cl=find_free_acp_t(idx))==-1)
+
+	if ((cl = find_free_acp_t(idx)) == -1)
 		return -1;
 	accept_tbl[idx].accepts++;
-	accept_tbl[idx].acp_t[cl]=cur_t;
-	accept_tbl[idx].closed[cl]=0;
+	accept_tbl[idx].acp_t[cl] = cur_t;
+	accept_tbl[idx].closed[cl] = 0;
 	inet_copy(&accept_tbl[idx].ip, &ip);
 #endif
 	return cl;
@@ -208,67 +225,71 @@ int new_accept(int idx, inet_prefix ip)
  * add_accept: It adds a new accept of `ip'. If `replace' is not 0 the `ip's
  * accepts are not incremented and accept_sidx is set to 0.
  */
-int add_accept(inet_prefix ip, int replace)
+int
+add_accept(inet_prefix ip, int replace)
 {
 	/* TODO: activate and test it !! */
 #if 0
 	int err, idx, cl;
-	
-	if((err=is_ip_acpt_free(ip, &idx)))
+
+	if ((err = is_ip_acpt_free(ip, &idx)))
 		return err;
 
-	if(!replace || !accept_tbl[idx].accepts) {
-		cl=new_accept(idx, ip);
-		if(cl < 0)
+	if (!replace || !accept_tbl[idx].accepts) {
+		cl = new_accept(idx, ip);
+		if (cl < 0)
 			return -1;
-	} else 
-		cl=0;
+	} else
+		cl = 0;
 
-	/*This global var will be given to the thread*/
+	/*This global var will be given to the thread */
 	pthread_mutex_lock(&mtx_acpt_idx);
-	accept_idx=idx;
+	accept_idx = idx;
 	pthread_mutex_unlock(&mtx_acpt_idx);
 
 	pthread_mutex_lock(&mtx_acpt_sidx);
-	accept_sidx=cl;
+	accept_sidx = cl;
 	pthread_mutex_unlock(&mtx_acpt_sidx);
 #endif
 	return 0;
 }
 
-void del_accept(int idx, int *sidx)
+void
+del_accept(int idx, int *sidx)
 {
 #if 0
-	if(!accept_tbl[idx].accepts) 
+	if (!accept_tbl[idx].accepts)
 		return;
 
-	if(accept_tbl[idx].acp_t[*sidx]) {
+	if (accept_tbl[idx].acp_t[*sidx]) {
 		accept_tbl[idx].accepts--;
-		accept_tbl[idx].acp_t[*sidx]=0;
-		accept_tbl[idx].closed[*sidx]=0;
-		if(!accept_tbl[idx].accepts)
+		accept_tbl[idx].acp_t[*sidx] = 0;
+		accept_tbl[idx].closed[*sidx] = 0;
+		if (!accept_tbl[idx].accepts)
 			memset(&accept_tbl[idx].ip, '\0', sizeof(inet_prefix));
 		(*sidx)--;
 	}
 #endif
 }
 
-int close_accept(int idx, int sidx)
+int
+close_accept(int idx, int sidx)
 {
 #if 0
-	if(!accept_tbl[idx].accepts) 
+	if (!accept_tbl[idx].accepts)
 		return -1;
-	
-	accept_tbl[idx].closed[sidx]=1;
+
+	accept_tbl[idx].closed[sidx] = 1;
 #endif
 	return 0;
 }
 
-void add_accept_pid(pid_t pid, int idx, int sidx)
+void
+add_accept_pid(pid_t pid, int idx, int sidx)
 {
 	/* TODO: activate and test it !! */
 #if 0
-	accept_tbl[idx].pid[sidx]=pid;
+	accept_tbl[idx].pid[sidx] = pid;
 /*	debug(DBG_NOISE, "ACPT: Added pig %d in accept_tbl[%d].pid[%d]", 
 			accept_tbl[idx].pid[sidx], idx, sidx);
 */

src/accept.h

@@ -22,26 +22,25 @@
 #define MAX_CONNECTIONS		512
 
 #define MAX_ACCEPTS		16
-#define FREE_ACCEPT_TIME	4		/*in seconds*/
+#define FREE_ACCEPT_TIME	4	/*in seconds */
 
 /*
  * This struct keep tracks of single connection to the server.
  * The thread_daemon who handle the connection knows the connection
  * position in the accept_tbl.
  */
-struct accept_table
-{
-	inet_prefix	   ip;			/*Ip of the node connected*/
-	unsigned char	   accepts;		/*Number of connection from this node*/
-	pid_t              *pid;   	        /*The pid of each child that have accepted the conn*/
-	unsigned char      *closed; 		/*Each element of this array is 1 or 0. It indicates if the connection has
-                                                  been closed*/
-	time_t		   *acp_t;		/*The time when the connection was accepted. The "accepts" counter
-						  will decrement when one of the acp_t+FREE_ACCEPT_TIME will 
-						  be <= current_time AND (the relative pid will be non existent OR
-						  the relative closed element will be == 1)
-						 */
-	struct request_tbl rqtbl;		/*The request table*/
+struct accept_table {
+	inet_prefix ip;				/*Ip of the node connected */
+	unsigned char accepts;		/*Number of connection from this node */
+	pid_t *pid;					/*The pid of each child that have accepted the conn */
+	unsigned char *closed;		/*Each element of this array is 1 or 0. It indicates if the connection has
+								   been closed */
+	time_t *acp_t;				/*The time when the connection was accepted. The "accepts" counter
+								   will decrement when one of the acp_t+FREE_ACCEPT_TIME will 
+								   be <= current_time AND (the relative pid will be non existent OR
+								   the relative closed element will be == 1)
+								 */
+	struct request_tbl rqtbl;	/*The request table */
 };
 
 /* This struct keeps all the info regarding each node connected */
@@ -62,14 +61,14 @@ int max_connections, max_accepts_per_host, free_accept_time;
 void init_accept_tbl(int startups, int accepts, int time);
 void destroy_accept_tbl(void);
 void update_accept_tbl(void);
-int  find_ip_acpt(inet_prefix ip);
-int  find_first_free(void);
-int  is_ip_acpt_free(inet_prefix ip, int *index);
-int  find_free_acp_t(int idx);
+int find_ip_acpt(inet_prefix ip);
+int find_first_free(void);
+int is_ip_acpt_free(inet_prefix ip, int *index);
+int find_free_acp_t(int idx);
 int new_accept(int idx, inet_prefix ip);
 int add_accept(inet_prefix ip, int replace);
 void del_accept(int idx, int *sidx);
-int  close_accept(int idx, int sidx);
+int close_accept(int idx, int sidx);
 void add_accept_pid(pid_t pid, int idx, int sidx);
 
-#endif /*ACCEPT_H*/
+#endif							/*ACCEPT_H */

src/andna.h

@@ -28,7 +28,7 @@
 #define ETC_RESOLV_CONF_BAK	"/etc/resolv.conf.bak"
 
 /* How many different andna pkt can be flooded simultaneusly */
-#define ANDNA_MAX_FLOODS	(ANDNA_MAX_QUEUE*3+1) 
+#define ANDNA_MAX_FLOODS	(ANDNA_MAX_QUEUE*3+1)
 
 /* How many new hash_gnodes are supported in the andna hash_gnode mutation */
 #define ANDNA_MAX_NEW_GNODES	1024
@@ -77,12 +77,12 @@ int last_spread_acache_pkt_id[ANDNA_MAX_FLOODS];
 #define ANDNA_REV_RESOLVE_RQ_TIMEOUT	60
 
 /* * * andna pkt flags * * */
-#define ANDNA_PKT_UPDATE	1		/* Update the hostname */
-#define ANDNA_PKT_FORWARD	(1<<1)		/* Forward this pkt, plz */
-#define ANDNA_PKT_REV_RESOLVE	(1<<2)		/* Give me your hostnames */
-#define ANDNA_PKT_JUST_CHECK	(1<<3)		/* Check only, don't update
-						   anything */
-#define ANDNA_PKT_SNSD_DEL	(1<<4)		/* SNSD delete request */
+#define ANDNA_PKT_UPDATE	1	/* Update the hostname */
+#define ANDNA_PKT_FORWARD	(1<<1)	/* Forward this pkt, plz */
+#define ANDNA_PKT_REV_RESOLVE	(1<<2)	/* Give me your hostnames */
+#define ANDNA_PKT_JUST_CHECK	(1<<3)	/* Check only, don't update
+										   anything */
+#define ANDNA_PKT_SNSD_DEL	(1<<4)	/* SNSD delete request */
 
 /*
  * andna_reg_pkt
@@ -98,32 +98,31 @@ int last_spread_acache_pkt_id[ANDNA_MAX_FLOODS];
  * that have to be registered. However the packet forwarded to the counter 
  * node won't keep this part.
  */
-struct andna_reg_pkt
-{
-	u_int	 	rip[MAX_IP_INT];	/* register_node ip */
- 	u_int		hash[MAX_IP_INT];	/* md5 hash of the host name to
-						   register. */
- 	char		pubkey[ANDNA_PKEY_LEN];	/* public key of the register
- 						   node. */
-	u_short		hname_updates;		/* number of updates already 
-						   made for the hostname */
-	
- 	char		sign[ANDNA_SIGNATURE_LEN]; /* RSA signature of the 
-						      entire pkt (excluding 
-						      `sign' itself and `flags'
-						    */
-	char 		flags;
-	
+struct andna_reg_pkt {
+	u_int rip[MAX_IP_INT];		/* register_node ip */
+	u_int hash[MAX_IP_INT];		/* md5 hash of the host name to
+								   register. */
+	char pubkey[ANDNA_PKEY_LEN];	/* public key of the register
+									   node. */
+	u_short hname_updates;		/* number of updates already 
+								   made for the hostname */
+
+	char sign[ANDNA_SIGNATURE_LEN];	/* RSA signature of the 
+									   entire pkt (excluding 
+									   `sign' itself and `flags'
+									 */
+	char flags;
+
 } _PACKED_;
 #define ANDNA_REG_PKT_SZ	     (sizeof(struct andna_reg_pkt))
 #define ANDNA_REG_SIGNED_BLOCK_SZ (ANDNA_REG_PKT_SZ - ANDNA_SIGNATURE_LEN - \
 				 	sizeof(char))
-INT_INFO andna_reg_pkt_iinfo = 	{ 1, /* `rip' and `hash' aren't considered */
-				 { INT_TYPE_16BIT },
-				 { MAX_IP_SZ*2 + ANDNA_PKEY_LEN },
-				 { 1 },
-			  	};
-				 
+INT_INFO andna_reg_pkt_iinfo = { 1,	/* `rip' and `hash' aren't considered */
+	{INT_TYPE_16BIT},
+	{MAX_IP_SZ * 2 + ANDNA_PKEY_LEN},
+	{1},
+};
+
 
 /*
  *   andna_resolve_rq_pkt
@@ -131,42 +130,40 @@ INT_INFO andna_reg_pkt_iinfo = 	{ 1, /* `rip' and `hash' aren't considered */
  * The andna resolve request pkt is used to resolve hostnames, IPs and MX
  * hostnames.
  */
-struct andna_resolve_rq_pkt
-{
-	u_int	 	rip[MAX_IP_INT];	/* the ip of the requester node */
-	char		flags;
-	
-	u_int           hash[MAX_IP_INT];       /* md5 hash of the hostname to
-						   resolve. */
-	int		service;		/* the snsd service of the hname */
-	u_char		proto;			/* the protocol of `service' */
+struct andna_resolve_rq_pkt {
+	u_int rip[MAX_IP_INT];		/* the ip of the requester node */
+	char flags;
+
+	u_int hash[MAX_IP_INT];		/* md5 hash of the hostname to
+								   resolve. */
+	int service;				/* the snsd service of the hname */
+	u_char proto;				/* the protocol of `service' */
 } _PACKED_;
 #define ANDNA_RESOLVE_RQ_PKT_SZ		(sizeof(struct andna_resolve_rq_pkt))
-INT_INFO andna_resolve_rq_pkt_iinfo =	{ 1, /* `rip' and `hash' are ignored */
-					  { INT_TYPE_32BIT },
-					  { MAX_IP_SZ*2+sizeof(char) },
-					  { 1 },
-					};
+INT_INFO andna_resolve_rq_pkt_iinfo = { 1,	/* `rip' and `hash' are ignored */
+	{INT_TYPE_32BIT},
+	{MAX_IP_SZ * 2 + sizeof(char)},
+	{1},
+};
 
 /* 
  * The reply to the resolve request
  */
-struct andna_resolve_reply_pkt
-{
-	uint32_t	timestamp;		/* the difference between the current
-						   time and the last time the resolved
-						   hname was updated */
+struct andna_resolve_reply_pkt {
+	uint32_t timestamp;			/* the difference between the current
+								   time and the last time the resolved
+								   hname was updated */
 	/*
 	 * the rest of the pkt is a pack of one snsd_service llist:
-	 * char		service[SNSD_SERVICE_LLIST_PACK_SZ(service)];
+	 * char     service[SNSD_SERVICE_LLIST_PACK_SZ(service)];
 	 */
 } _PACKED_;
 #define ANDNA_RESOLVE_REPLY_PKT_SZ	(sizeof(struct andna_resolve_reply_pkt))
-INT_INFO andna_resolve_reply_pkt_iinfo = { 1, /* `ip' is ignored */
-					   { INT_TYPE_32BIT }, 
-					   { 0 }, 
-					   { 1 }
-					 };
+INT_INFO andna_resolve_reply_pkt_iinfo = { 1,	/* `ip' is ignored */
+	{INT_TYPE_32BIT},
+	{0},
+	{1}
+};
 
 
 /* 
@@ -189,19 +186,19 @@ INT_INFO andna_resolve_reply_pkt_iinfo = { 1, /* `ip' is ignored */
  * the pkt reaches a true old hash_gnode, or cannot be forwarded anymore since
  * there are no more older hash_gnodes.
  */
-struct single_acache_hdr
-{
-	u_int		rip[MAX_IP_INT];	/* the ip of the requester node */
-	u_int		hash[MAX_IP_INT];
-	u_short		hgnodes;		/* Number of hgnodes in the 
-						   body. */
-	u_char		flags;
+struct single_acache_hdr {
+	u_int rip[MAX_IP_INT];		/* the ip of the requester node */
+	u_int hash[MAX_IP_INT];
+	u_short hgnodes;			/* Number of hgnodes in the 
+								   body. */
+	u_char flags;
 } _PACKED_;
-INT_INFO single_acache_hdr_iinfo = { 1, /* `rip' and `hash' are ignored */
-				     { INT_TYPE_16BIT },
-				     { MAX_IP_SZ*2 },
-				     { 1 },
-				   };
+INT_INFO single_acache_hdr_iinfo = { 1,	/* `rip' and `hash' are ignored */
+	{INT_TYPE_16BIT},
+	{MAX_IP_SZ * 2},
+	{1},
+};
+
 /*
  * The single_acache body is:
  * struct {
@@ -220,12 +217,11 @@ INT_INFO single_acache_hdr_iinfo = { 1, /* `rip' and `hash' are ignored */
  * Tell the node, which receives the pkt, to send a ANDNA_GET_SINGLE_ACACHE
  * request to fetch the andna_cache for the `hash' included in the pkt.
  */
-struct spread_acache_pkt
-{
-	u_int		hash[MAX_IP_INT];
+struct spread_acache_pkt {
+	u_int hash[MAX_IP_INT];
 } _PACKED_;
 #define SPREAD_ACACHE_PKT_SZ	(sizeof(struct spread_acache_pkt))
-INT_INFO spread_acache_pkt_info = { 0, { 0 }, { 0 }, { 0 } };
+INT_INFO spread_acache_pkt_info = { 0, {0}, {0}, {0} };
 
 
 
@@ -243,16 +239,16 @@ void andna_close(void);
 void andna_resolvconf_modify(void);
 void andna_resolvconf_restore(void);
 
-int andna_register_hname(lcl_cache *alcl, snsd_service *snsd_delete);
+int andna_register_hname(lcl_cache * alcl, snsd_service * snsd_delete);
 int andna_recv_reg_rq(PACKET rpkt);
 
 int andna_check_counter(PACKET pkt);
 int andna_recv_check_counter(PACKET rpkt);
 
-snsd_service *andna_resolve_hash(u_int hname_hash[MAX_IP_INT], int service, 
-				 u_char proto, int *records);
-snsd_service *andna_resolve_hname(char *hname, int service, u_char proto, 
-				  int *records);
+snsd_service *andna_resolve_hash(u_int hname_hash[MAX_IP_INT], int service,
+								 u_char proto, int *records);
+snsd_service *andna_resolve_hname(char *hname, int service, u_char proto,
+								  int *records);
 int andna_recv_resolve_rq(PACKET rpkt);
 
 lcl_cache *andna_reverse_resolve(inet_prefix ip);
@@ -260,7 +256,8 @@ int andna_recv_rev_resolve_rq(PACKET rpkt);
 
 int spread_single_acache(u_int hash[MAX_IP_INT]);
 int recv_spread_single_acache(PACKET rpkt);
-andna_cache *get_single_andna_c(u_int hash[MAX_IP_INT], u_int hash_gnode[MAX_IP_INT]);
+andna_cache *get_single_andna_c(u_int hash[MAX_IP_INT],
+								u_int hash_gnode[MAX_IP_INT]);
 int put_single_acache(PACKET rpkt);
 int put_andna_cache(PACKET rq_pkt);
 int put_counter_cache(PACKET rq_pkt);
@@ -270,4 +267,4 @@ void andna_update_hnames(int only_new_hname);
 void *andna_maintain_hnames_active(void *null);
 void *andna_main(void *);
 
-#endif /*ANDNA_H*/
+#endif							/*ANDNA_H */

src/andna_cache.h

@@ -34,11 +34,11 @@
 #define ANDNA_MAX_HNAME_LEN		512	/* (null terminator included) */
 #define ANDNA_MAX_HOSTNAMES		256	/* Max number of hnames per node */
 #define ANDNA_MAX_RHC_HNAMES		512	/* Max number of hnames kept in
-						   the resolved_hnames cache* */
-#define ANDNA_EXPIRATION_TIME		259200	/* 3 days (in seconds)*/
+										   the resolved_hnames cache* */
+#define ANDNA_EXPIRATION_TIME		259200	/* 3 days (in seconds) */
 #define ANDNA_MIN_UPDATE_TIME		3600	/* The minum amount of time to
-						   be waited before sending an 
-						   update of the hname. */
+											   be waited before sending an 
+											   update of the hname. */
 
 #define ANDNA_PRIVKEY_BITS		1024
 #define ANDNA_SKEY_MAX_LEN		900
@@ -51,75 +51,73 @@
 					  ((seeds)*32)/MAXGROUPNODE : (seeds);})
 
 #ifdef DEBUG
-	#undef ANDNA_EXPIRATION_TIME
-	#define ANDNA_EXPIRATION_TIME 100
-	#undef ANDNA_MIN_UPDATE_TIME
-	#define ANDNA_MIN_UPDATE_TIME 2
-#endif 
+#undef ANDNA_EXPIRATION_TIME
+#define ANDNA_EXPIRATION_TIME 100
+#undef ANDNA_MIN_UPDATE_TIME
+#define ANDNA_MIN_UPDATE_TIME 2
+#endif
 
 /* 
  * * *  Cache stuff  * * *
  */
 
 /* * andna_cache flags * */
-#define ANDNA_BACKUP		1		/* We are a backup_node */
-#define ANDNA_COUNTER		(1<<1)		/* We are a counter_node */
-#define ANDNA_ROUNDED		(1<<2)		/* We are a rounded_hash_node */
-#define ANDNA_FULL		(1<<3)		/* Queue full */
-#define ANDNA_UPDATING		(1<<4)		/* The hname is being updated 
-						   right now */
+#define ANDNA_BACKUP		1	/* We are a backup_node */
+#define ANDNA_COUNTER		(1<<1)	/* We are a counter_node */
+#define ANDNA_ROUNDED		(1<<2)	/* We are a rounded_hash_node */
+#define ANDNA_FULL		(1<<3)	/* Queue full */
+#define ANDNA_UPDATING		(1<<4)	/* The hname is being updated 
+									   right now */
 
 /* 
  * andna_cache_queue
  * 
  * The queue of the andna_cache. (see below).
  */
-struct andna_cache_queue
-{	
-	LLIST_HDR	(struct andna_cache_queue);
-		
-	time_t		timestamp;
-	u_short		hname_updates;		/* numbers of hname's updates */
-	char		pubkey[ANDNA_PKEY_LEN];
-
-	u_short		snsd_counter;		/* # of `snsd' nodes */
-	snsd_service	*service;
+struct andna_cache_queue {
+	LLIST_HDR(struct andna_cache_queue);
+
+	time_t timestamp;
+	u_short hname_updates;		/* numbers of hname's updates */
+	char pubkey[ANDNA_PKEY_LEN];
+
+	u_short snsd_counter;		/* # of `snsd' nodes */
+	snsd_service *service;
 };
 typedef struct andna_cache_queue andna_cache_queue;
-		
+
 /*
  * andna_cache
  * 
  * It keeps the entries of the hostnames registered by other nodes.
  */
-struct andna_cache
-{
-	LLIST_HDR	(struct andna_cache);
-	
-	u_int 		hash[MAX_IP_INT];	/* hostname's hash */
-	char 		flags;
-
-	u_short		queue_counter;
-	andna_cache_queue *acq;			/* The queue of the registration.
-						   The first is the active one */
+struct andna_cache {
+	LLIST_HDR(struct andna_cache);
+
+	u_int hash[MAX_IP_INT];		/* hostname's hash */
+	char flags;
+
+	u_short queue_counter;
+	andna_cache_queue *acq;		/* The queue of the registration.
+								   The first is the active one */
 };
 typedef struct andna_cache andna_cache;
 
 /* part of the counter cache, see below */
-struct counter_c_hashes
-{
-	LLIST_HDR	(struct counter_c_hashes);
+struct counter_c_hashes {
+	LLIST_HDR(struct counter_c_hashes);
 
-	time_t		timestamp;
-	u_short		hname_updates;
-	int		hash[MAX_IP_INT];
+	time_t timestamp;
+	u_short hname_updates;
+	int hash[MAX_IP_INT];
 };
 typedef struct counter_c_hashes counter_c_hashes;
-INT_INFO counter_c_hashes_body_iinfo = { 2, 
-					 { INT_TYPE_32BIT, INT_TYPE_16BIT },
-					 { 0, sizeof(time_t) },
-					 { 1, 1 }
-				       };
+INT_INFO counter_c_hashes_body_iinfo = { 2,
+	{INT_TYPE_32BIT, INT_TYPE_16BIT},
+	{0, sizeof(time_t)}
+	,
+	{1, 1}
+};
 
 /*
  * counter_c
@@ -128,22 +126,21 @@ INT_INFO counter_c_hashes_body_iinfo = { 2,
  * All the infos regarding a particular register_node are stored here. For
  * example, we need to know how many hostnames he already registered.
  */
-struct counter_c
-{
-	LLIST_HDR	(struct counter_c);
-
-	char            pubkey[ANDNA_PKEY_LEN];
-	char		flags;
-	
-	u_short		hashes;			/* The number of hashes in cch */
-	counter_c_hashes *cch;			/* The hashes of the hnames */
+struct counter_c {
+	LLIST_HDR(struct counter_c);
+
+	char pubkey[ANDNA_PKEY_LEN];
+	char flags;
+
+	u_short hashes;				/* The number of hashes in cch */
+	counter_c_hashes *cch;		/* The hashes of the hnames */
 };
 typedef struct counter_c counter_c;
 INT_INFO counter_c_body_iinfo = { 1,
-				  { INT_TYPE_16BIT },
-				  { ANDNA_PKEY_LEN+sizeof(char) },
-				  { 1 }
-				};
+	{INT_TYPE_16BIT},
+	{ANDNA_PKEY_LEN + sizeof(char)},
+	{1}
+};
 
 /*
  * lcl_cache_keyring
@@ -151,15 +148,14 @@ INT_INFO counter_c_body_iinfo = { 1,
  * The lcl keyring is used to store the RSA keys used to complete some of the
  * ANDNA requests, (f.e. registering or updating a hname).
  */
-typedef struct
-{
-	u_int		skey_len;
-	u_int		pkey_len;
-	
-	u_char		*privkey;		/* secret key packed */
-	u_char		*pubkey;		/* pubkey packed */
-
-	RSA		*priv_rsa;		/* key pair unpacked */
+typedef struct {
+	u_int skey_len;
+	u_int pkey_len;
+
+	u_char *privkey;			/* secret key packed */
+	u_char *pubkey;				/* pubkey packed */
+
+	RSA *priv_rsa;				/* key pair unpacked */
 } lcl_cache_keyring;
 
 
@@ -169,24 +165,23 @@ typedef struct
  * The Local Andna Cache keeps all the hostnames which have been register by
  * localhost (ourself).
  */
-struct lcl_cache
-{
-	LLIST_HDR	(struct lcl_cache);
-
-	char		*hostname;		/* The registered hostname */
-	u_int		hash;			/* 32bit hash of the md5 hash 
-						   of the hname */
-	u_short		hname_updates;		/* How many updates we've done 
-						   for this hostname */
-	time_t          timestamp;		/* the last time when the hname
-						   was updated. If it is 0, the
-						   hname has still to be 
-						   registered */
-	
-	u_short		snsd_counter;		/* # of `snsds' */
-	snsd_service	*service;
-	
-	char 		flags;
+struct lcl_cache {
+	LLIST_HDR(struct lcl_cache);
+
+	char *hostname;				/* The registered hostname */
+	u_int hash;					/* 32bit hash of the md5 hash 
+								   of the hname */
+	u_short hname_updates;		/* How many updates we've done 
+								   for this hostname */
+	time_t timestamp;			/* the last time when the hname
+								   was updated. If it is 0, the
+								   hname has still to be 
+								   registered */
+
+	u_short snsd_counter;		/* # of `snsds' */
+	snsd_service *service;
+
+	char flags;
 };
 typedef struct lcl_cache lcl_cache;
 
@@ -205,21 +200,20 @@ typedef struct lcl_cache lcl_cache;
  * removed to empty new space.
  * The hname which have the `timestamp' expired are removed too.
  */
-struct resolved_hnames_cache
-{
-	LLIST_HDR	(struct resolved_hnames_cache);
-
-	u_int		hash;		/* 32bit hash of the md5 hash of the
-					   hname */
-	char		flags;
-	
-	time_t		timestamp;	/* the last time when the hname
-					   was updated. With this we know that
-					   at timestamp+ANDNA_EXPIRATION_TIME
-					   this cache will expire. */
-	
-	u_short		snsd_counter;
-	snsd_service	*service;
+struct resolved_hnames_cache {
+	LLIST_HDR(struct resolved_hnames_cache);
+
+	u_int hash;					/* 32bit hash of the md5 hash of the
+								   hname */
+	char flags;
+
+	time_t timestamp;			/* the last time when the hname
+								   was updated. With this we know that
+								   at timestamp+ANDNA_EXPIRATION_TIME
+								   this cache will expire. */
+
+	u_short snsd_counter;
+	snsd_service *service;
 };
 typedef struct resolved_hnames_cache rh_cache;
 
@@ -252,22 +246,23 @@ int rhc_counter;
  *  * * * lcl cache package * * *
  */
 
-struct lcl_keyring_pkt_hdr
-{
-	u_int		skey_len;
-	u_int		pkey_len;
-}_PACKED_;
+struct lcl_keyring_pkt_hdr {
+	u_int skey_len;
+	u_int pkey_len;
+} _PACKED_;
 /* 
  * the rest of the pkt is:
  * 
  *	char		privkey[hdr.skey_len];
  *	char		pubkey[hdr.pkey_len];
  */
-INT_INFO lcl_keyring_pkt_hdr_iinfo = { 2, 
-				     { INT_TYPE_32BIT, INT_TYPE_32BIT }, 
-				     { 0, sizeof(u_int) }, 
-				     { 1, 1 } 
-				   };
+INT_INFO lcl_keyring_pkt_hdr_iinfo = { 2,
+	{INT_TYPE_32BIT, INT_TYPE_32BIT},
+	{0, sizeof(u_int)}
+	,
+	{1, 1}
+};
+
 #define LCL_KEYRING_HDR_PACK_SZ(khdr)	(sizeof(struct lcl_keyring_pkt_hdr) + \
 					(khdr)->skey_len + (khdr)->pkey_len)
 
@@ -275,14 +270,14 @@ INT_INFO lcl_keyring_pkt_hdr_iinfo = { 2,
  * The local cache pkt is used to pack the entire local cache to save it in a 
  * file or to send it to a node.
  */
-struct lcl_cache_pkt_hdr
-{
-	u_short		tot_caches;		/* How many lcl structs there 
-						   are in the pkt's body */
-}_PACKED_;
-INT_INFO lcl_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
+struct lcl_cache_pkt_hdr {
+	u_short tot_caches;			/* How many lcl structs there 
+								   are in the pkt's body */
+} _PACKED_;
+INT_INFO lcl_cache_pkt_hdr_iinfo = { 1, {INT_TYPE_16BIT}, {0}, {1} };
+
 #define LCL_CACHE_HDR_PACK_SZ		(sizeof(struct lcl_cache_pkt_hdr))
-		
+
 /* 
  * The body is:
  *	
@@ -295,10 +290,11 @@ INT_INFO lcl_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
  */
 #define LCL_CACHE_BODY_PACK_SZ(hname_len) 	((hname_len) + sizeof(u_short) \
 						  + sizeof(time_t))
-INT_INFO lcl_cache_pkt_body_iinfo = { 2, { INT_TYPE_16BIT, INT_TYPE_32BIT }, 
-				      { 0, sizeof(u_short) },
-				      { 1, 1 }
-				    };
+INT_INFO lcl_cache_pkt_body_iinfo = { 2, {INT_TYPE_16BIT, INT_TYPE_32BIT},
+{0, sizeof(u_short)}
+,
+{1, 1}
+};
 
 /*
  *  * * * andna cache package * * *
@@ -316,20 +312,23 @@ INT_INFO lcl_cache_pkt_body_iinfo = { 2, { INT_TYPE_16BIT, INT_TYPE_32BIT },
  * };
  */
 INT_INFO acq_body_iinfo = { 3,
-			    { INT_TYPE_32BIT, INT_TYPE_16BIT, INT_TYPE_16BIT },
-			    { 0, sizeof(time_t),
-				    sizeof(time_t) + sizeof(u_short) + ANDNA_PKEY_LEN },
-			    { 1, 1, 1 }
-			  };
+	{INT_TYPE_32BIT, INT_TYPE_16BIT, INT_TYPE_16BIT}
+	,
+	{0, sizeof(time_t),
+	 sizeof(time_t) + sizeof(u_short) + ANDNA_PKEY_LEN}
+	,
+	{1, 1, 1}
+};
+
 #define ACQ_BODY_PACK_SZ		(sizeof(time_t) + sizeof(u_short)*2 + \
 					 ANDNA_PKEY_LEN)
 #define ACQ_PACK_SZ(snsd_pack_sz)	(ACQ_BODY_PACK_SZ + (snsd_pack_sz))
 
-struct andna_cache_pkt_hdr
-{
-	u_short		tot_caches;
-}_PACKED_;
-INT_INFO andna_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
+struct andna_cache_pkt_hdr {
+	u_short tot_caches;
+} _PACKED_;
+INT_INFO andna_cache_pkt_hdr_iinfo = { 1, {INT_TYPE_16BIT}, {0}, {1} };
+
 /*
  * The body is:
  * struct andna_cache_pack {
@@ -339,11 +338,12 @@ INT_INFO andna_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
  * 	char		acq_pack[ACQ_PACK_SZ*queue_counter];
  * } acache_pack[hdr.tot_caches];
  */
-INT_INFO andna_cache_body_iinfo = { 1, 
-				    { INT_TYPE_16BIT },
-				    { MAX_IP_SZ+sizeof(char) },
-				    { 1 }
-				  };
+INT_INFO andna_cache_body_iinfo = { 1,
+	{INT_TYPE_16BIT},
+	{MAX_IP_SZ + sizeof(char)},
+	{1}
+};
+
 #define ACACHE_BODY_PACK_SZ		(ANDNA_HASH_SZ + sizeof(char) + 	\
 					   sizeof(u_short))
 #define ACACHE_PACK_SZ(acq_pack_sz)	((acq_pack_sz) + ACACHE_BODY_PACK_SZ)
@@ -368,11 +368,11 @@ INT_INFO andna_cache_body_iinfo = { 1,
  * The counter cache pkt is similar to the andna_cache_pkt, it is completely
  * arranged in the same way.
  */
-struct counter_c_pkt_hdr
-{
-	u_short		tot_caches;
-}_PACKED_;
-INT_INFO counter_c_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
+struct counter_c_pkt_hdr {
+	u_short tot_caches;
+} _PACKED_;
+INT_INFO counter_c_pkt_hdr_iinfo = { 1, {INT_TYPE_16BIT}, {0}, {1} };
+
 #define COUNTER_CACHE_HASHES_PACK_SZ	(sizeof(time_t) + sizeof(u_short) +	\
 						ANDNA_HASH_SZ)
 #define COUNTER_CACHE_BODY_PACK_SZ	(ANDNA_PKEY_LEN + sizeof(char)    + 	\
@@ -384,12 +384,12 @@ INT_INFO counter_c_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
  *  * * * Resolved hostnames cache pkt. * * *
  */
 
-struct rh_cache_pkt_hdr
-{
-	u_short		tot_caches;		/* How many lcl structs there 
-						   are in the pkt's hdr */
-}_PACKED_;
-INT_INFO rh_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
+struct rh_cache_pkt_hdr {
+	u_short tot_caches;			/* How many lcl structs there 
+								   are in the pkt's hdr */
+} _PACKED_;
+INT_INFO rh_cache_pkt_hdr_iinfo = { 1, {INT_TYPE_16BIT}, {0}, {1} };
+
 /*
  * The body is:
  * struct rh_cache_pkt_body {
@@ -405,11 +405,12 @@ INT_INFO rh_cache_pkt_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { 1 } };
 						 sizeof(time_t)+sizeof(u_short)+\
 						 (snsd_pack_sz))
 INT_INFO rh_cache_pkt_body_iinfo = { 3,
-				    { INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_16BIT },
-				    { 0, sizeof(u_int)+sizeof(char), 
-					    sizeof(u_int)+sizeof(char)+sizeof(time_t) },
-				    { 1, 1, 1 }
-				   };
+	{INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_16BIT},
+	{0, sizeof(u_int) + sizeof(char),
+	 sizeof(u_int) + sizeof(char) + sizeof(time_t)}
+	,
+	{1, 1, 1}
+};
 
 
 /*
@@ -418,35 +419,35 @@ INT_INFO rh_cache_pkt_body_iinfo = { 3,
 
 void andna_caches_init(int family);
 
-void lcl_new_keyring(lcl_cache_keyring *keyring);
-void lcl_destroy_keyring(lcl_cache_keyring *keyring);
+void lcl_new_keyring(lcl_cache_keyring * keyring);
+void lcl_destroy_keyring(lcl_cache_keyring * keyring);
 lcl_cache *lcl_cache_new(char *hname);
-void lcl_cache_free(lcl_cache *alcl);
-void lcl_cache_destroy(lcl_cache *head, int *counter);
-lcl_cache *lcl_cache_find_hname(lcl_cache *head, char *hname);
-lcl_cache *lcl_cache_find_hash(lcl_cache *alcl, u_int hash);
-lcl_cache *lcl_get_registered_hnames(lcl_cache *alcl);
-
-andna_cache_queue *ac_queue_findpubk(andna_cache *ac, char *pubk);
-andna_cache_queue *ac_queue_add(andna_cache *ac, char *pubkey);
-void ac_queue_del(andna_cache *ac, andna_cache_queue *acq);
-void ac_queue_del_expired(andna_cache *ac);
-void ac_queue_destroy(andna_cache *ac);
+void lcl_cache_free(lcl_cache * alcl);
+void lcl_cache_destroy(lcl_cache * head, int *counter);
+lcl_cache *lcl_cache_find_hname(lcl_cache * head, char *hname);
+lcl_cache *lcl_cache_find_hash(lcl_cache * alcl, u_int hash);
+lcl_cache *lcl_get_registered_hnames(lcl_cache * alcl);
+
+andna_cache_queue *ac_queue_findpubk(andna_cache * ac, char *pubk);
+andna_cache_queue *ac_queue_add(andna_cache * ac, char *pubkey);
+void ac_queue_del(andna_cache * ac, andna_cache_queue * acq);
+void ac_queue_del_expired(andna_cache * ac);
+void ac_queue_destroy(andna_cache * ac);
 andna_cache *andna_cache_findhash(int hash[MAX_IP_INT]);
 andna_cache *andna_cache_gethash(int hash[MAX_IP_INT]);
 andna_cache *andna_cache_addhash(int hash[MAX_IP_INT]);
-int andna_cache_del_ifexpired(andna_cache *ac);
+int andna_cache_del_ifexpired(andna_cache * ac);
 void andna_cache_del_expired(void);
 void andna_cache_destroy(void);
 
-counter_c_hashes *cc_hashes_add(counter_c *cc, int hash[MAX_IP_INT]);
-void cc_hashes_del(counter_c *cc, counter_c_hashes *cch);
-int counter_c_del_ifexpired(counter_c *cc);
-void cc_hashes_del_expired(counter_c *cc);
-void cc_hashes_destroy(counter_c *cc);
-counter_c_hashes *cc_findhash(counter_c *cc, int hash[MAX_IP_INT]);
+counter_c_hashes *cc_hashes_add(counter_c * cc, int hash[MAX_IP_INT]);
+void cc_hashes_del(counter_c * cc, counter_c_hashes * cch);
+int counter_c_del_ifexpired(counter_c * cc);
+void cc_hashes_del_expired(counter_c * cc);
+void cc_hashes_destroy(counter_c * cc);
+counter_c_hashes *cc_findhash(counter_c * cc, int hash[MAX_IP_INT]);
 counter_c *counter_c_findpubk(char *pubk);
-counter_c *counter_c_add(inet_prefix *rip, char *pubkey);
+counter_c *counter_c_add(inet_prefix * rip, char *pubkey);
 void counter_c_del_expired(void);
 void counter_c_destroy(void);
 
@@ -455,45 +456,48 @@ rh_cache *rh_cache_add_hash(u_int hash, time_t timestamp);
 rh_cache *rh_cache_add(char *hname, time_t timestamp);
 rh_cache *rh_cache_find_hash(u_int hash);
 rh_cache *rh_cache_find_hname(char *hname);
-void rh_cache_del(rh_cache *rhc);
+void rh_cache_del(rh_cache * rhc);
 void rh_cache_del_expired(void);
 void rh_cache_flush(void);
 
-char *pack_lcl_keyring(lcl_cache_keyring *keyring, size_t *pack_sz);
-int unpack_lcl_keyring(lcl_cache_keyring *keyring, char *pack, size_t pack_sz);
+char *pack_lcl_keyring(lcl_cache_keyring * keyring, size_t * pack_sz);
+int unpack_lcl_keyring(lcl_cache_keyring * keyring, char *pack,
+					   size_t pack_sz);
 
-char *pack_lcl_cache(lcl_cache *local_cache, size_t *pack_sz);
+char *pack_lcl_cache(lcl_cache * local_cache, size_t * pack_sz);
 lcl_cache *unpack_lcl_cache(char *pack, size_t pack_sz, int *counter);
 
-char *pack_andna_cache(andna_cache *acache, size_t *pack_sz, int pack_type);
+char *pack_andna_cache(andna_cache * acache, size_t * pack_sz,
+					   int pack_type);
 andna_cache *unpack_andna_cache(char *pack, size_t pack_sz, int *counter,
-				int pack_type);
+								int pack_type);
 
-char *pack_counter_cache(counter_c *countercache,  size_t *pack_sz);
+char *pack_counter_cache(counter_c * countercache, size_t * pack_sz);
 counter_c *unpack_counter_cache(char *pack, size_t pack_sz, int *counter);
 
-char *pack_rh_cache(rh_cache *rhcache, size_t *pack_sz);
+char *pack_rh_cache(rh_cache * rhcache, size_t * pack_sz);
 rh_cache *unpack_rh_cache(char *pack, size_t pack_sz, int *counter);
 
-int save_lcl_keyring(lcl_cache_keyring *keyring, char *file);
-int load_lcl_keyring(lcl_cache_keyring *keyring, char *file);
+int save_lcl_keyring(lcl_cache_keyring * keyring, char *file);
+int load_lcl_keyring(lcl_cache_keyring * keyring, char *file);
 
-int save_lcl_cache(lcl_cache *lcl, char *file);
+int save_lcl_cache(lcl_cache * lcl, char *file);
 lcl_cache *load_lcl_cache(char *file, int *counter);
 
-int save_andna_cache(andna_cache *acache, char *file);
+int save_andna_cache(andna_cache * acache, char *file);
 andna_cache *load_andna_cache(char *file, int *counter);
 
-int save_counter_c(counter_c *countercache, char *file);
+int save_counter_c(counter_c * countercache, char *file);
 counter_c *load_counter_c(char *file, int *counter);
 
-int save_rh_cache(rh_cache *rh, char *file);
+int save_rh_cache(rh_cache * rh, char *file);
 rh_cache *load_rh_cache(char *file, int *counter);
 
-int load_hostnames(char *file, lcl_cache **old_alcl_head, int *old_alcl_counter);
-int load_snsd(char *file, lcl_cache *alcl_head);
+int load_hostnames(char *file, lcl_cache ** old_alcl_head,
+				   int *old_alcl_counter);
+int load_snsd(char *file, lcl_cache * alcl_head);
 
 int add_resolv_conf(char *hname, char *file);
 int del_resolv_conf(char *hname, char *file);
 
-#endif		/*ANDNA_CACHE_H*/
+#endif							/*ANDNA_CACHE_H */

src/andns.h

@@ -1,4 +1,4 @@
-	         /**************************************
+			 /**************************************
 	        *     AUTHOR: Federico Tomassini        *
 	       *     Copyright (C) Federico Tomassini    *
 	      *     Contact effetom@gmail.com	          *
@@ -30,7 +30,7 @@
 #define ANDNS_TIMEOUT		15
 
 #define MAXNSSERVERS 		3
-#define DNS_REPLY_TIMEOUT       10      /* seconds */
+#define DNS_REPLY_TIMEOUT       10	/* seconds */
 
 #define DNS_PORT		53
 #define DNS_PORT_STR		"53"
@@ -50,7 +50,7 @@
 #define NK_INET			2
 #define GET_NK_BIT(msg)		(*((msg+3))>>4)&0x03
 
-#define RCODE_NOERR		0	
+#define RCODE_NOERR		0
 #define RCODE_EINTRPRT		1
 #define RCODE_ESRVFAIL		2
 #define RCODE_ENSDMN 		3
@@ -64,23 +64,23 @@
 int store_ns(char *ns);
 int collect_resolv_conf(char *resolve_conf);
 void reset_andns_ns(void);
-int andns_init(int restricted, char *resolv_conf,int family);
+int andns_init(int restricted, char *resolv_conf, int family);
 void andns_close(void);
-int ns_general_send(char *msg,int msglen,char *answer,int anslen);
-void dpktacpy(dns_pkt *dst,dns_pkt *src,const char *prefix);
-dns_pkt* dpktcpy(dns_pkt *src,const char *prefix);
-char* rm_realm_prefix(char *from,char *dst,int type);
-dns_pkt* dpktcpy_rm_pref(dns_pkt *src);
-int andns_gethostbyname(char *hname, inet_prefix *ip);
-int andns_realm(dns_pkt_qst *dpq,int *prefixed);
-int is_prefixed(dns_pkt *dp);
-int dns_forward(dns_pkt *dp,char *msg,int msglen,char* answer);
-int inet_rslv(dns_pkt *dp,char *msg,int msglen,char *answer);
-int nk_rslv(andns_pkt *ap,char *msg,int msglen,char *answer);
-int qtype_a_to_d(andns_pkt *ap);
-int apqsttodpqst(andns_pkt *ap,dns_pkt **dpsrc);
-int dpanswtoapansw(dns_pkt *dp,andns_pkt *ap);
-int nk_forward(andns_pkt *ap,char *msg,int msglen,char *answer);
-char *andns_rslv(char *msg, int msglen,char *answer, int *answ_len);
+int ns_general_send(char *msg, int msglen, char *answer, int anslen);
+void dpktacpy(dns_pkt * dst, dns_pkt * src, const char *prefix);
+dns_pkt *dpktcpy(dns_pkt * src, const char *prefix);
+char *rm_realm_prefix(char *from, char *dst, int type);
+dns_pkt *dpktcpy_rm_pref(dns_pkt * src);
+int andns_gethostbyname(char *hname, inet_prefix * ip);
+int andns_realm(dns_pkt_qst * dpq, int *prefixed);
+int is_prefixed(dns_pkt * dp);
+int dns_forward(dns_pkt * dp, char *msg, int msglen, char *answer);
+int inet_rslv(dns_pkt * dp, char *msg, int msglen, char *answer);
+int nk_rslv(andns_pkt * ap, char *msg, int msglen, char *answer);
+int qtype_a_to_d(andns_pkt * ap);
+int apqsttodpqst(andns_pkt * ap, dns_pkt ** dpsrc);
+int dpanswtoapansw(dns_pkt * dp, andns_pkt * ap);
+int nk_forward(andns_pkt * ap, char *msg, int msglen, char *answer);
+char *andns_rslv(char *msg, int msglen, char *answer, int *answ_len);
 
-#endif /* ANDNS_H */
+#endif							/* ANDNS_H */

src/andns_lib.h

@@ -1,4 +1,4 @@
-                 /**************************************
+				 /**************************************
                 *     AUTHOR: Federico Tomassini        *
                *     Copyright (C) Federico Tomassini    *
               *     Contact effetom@gmail.com             *
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <sys/types.h>
 
-#define ANDNS_MAX_QUESTION_LEN	263 /* TODO */
+#define ANDNS_MAX_QUESTION_LEN	263	/* TODO */
 #define ANDNS_MAX_ANSWER_LEN	516
 #define ANDNS_MAX_ANSWERS_NUM	256
 #define ANDNS_MAX_PK_LEN	ANDNS_MAX_QUESTION_LEN+\
@@ -42,15 +42,14 @@
 #define ANDNS_COMPR_LEVEL	Z_BEST_COMPRESSION
 #define ANDNS_COMPR_THRESHOLD	1000
 
-struct andns_pkt_data
-{
-	uint8_t			m;
-	uint8_t			wg;
-	uint8_t			prio;
-        uint16_t                rdlength;
-        uint16_t                service;
-        char                    *rdata;
-        struct andns_pkt_data   *next;
+struct andns_pkt_data {
+	uint8_t m;
+	uint8_t wg;
+	uint8_t prio;
+	uint16_t rdlength;
+	uint16_t service;
+	char *rdata;
+	struct andns_pkt_data *next;
 };
 typedef struct andns_pkt_data andns_pkt_data;
 #define ANDNS_PKT_DATA_SZ sizeof(andns_pkt_data)
@@ -61,22 +60,21 @@ typedef struct andns_pkt_data andns_pkt_data;
 #define APD_TCP		1<<2
 #define APD_UDP		1<<3
 
-typedef struct andns_pkt
-{
-        uint16_t        id;
-        uint8_t         r;
-        uint8_t         qr;
-        uint8_t         p;
-        uint8_t         z;
-        uint8_t         qtype;
-        uint16_t        ancount;
-        uint8_t         ipv;
-        uint8_t         nk;
-        uint8_t         rcode;
-        uint16_t        service; 
-        uint16_t        qstlength;
-        char            *qstdata;
-        andns_pkt_data  *pkt_answ;
+typedef struct andns_pkt {
+	uint16_t id;
+	uint8_t r;
+	uint8_t qr;
+	uint8_t p;
+	uint8_t z;
+	uint8_t qtype;
+	uint16_t ancount;
+	uint8_t ipv;
+	uint8_t nk;
+	uint8_t rcode;
+	uint16_t service;
+	uint16_t qstlength;
+	char *qstdata;
+	andns_pkt_data *pkt_answ;
 } andns_pkt;
 #define ANDNS_PKT_SZ sizeof(andns_pkt)
 #define AP_ALIGN(ap)	(ap)->qstdata=(char*)xmalloc((ap)->qstlength)
@@ -96,16 +94,16 @@ typedef struct andns_pkt
 #define ANDNS_PROTO_TCP	0
 #define ANDNS_PROTO_UDP	1
 /* ANDNS QUERY-TYPE */
-#define AT_A            0 /* h->ip */
-#define AT_PTR          1 /* ip->h */
-#define AT_G          	2 /* global */
+#define AT_A            0		/* h->ip */
+#define AT_PTR          1		/* ip->h */
+#define AT_G          	2		/* global */
 /* RCODES: The rcodes are portable between ANDNS and DNS */
-#define ANDNS_RCODE_NOERR     0       /* No error */
-#define ANDNS_RCODE_EINTRPRT  1       /* Intepret error */
-#define ANDNS_RCODE_ESRVFAIL  2       /* Server failure */
-#define ANDNS_RCODE_ENSDMN    3       /* No such domain */
-#define ANDNS_RCODE_ENIMPL    4       /* Not implemented */
-#define ANDNS_RCODE_ERFSD     5       /* Refused */
+#define ANDNS_RCODE_NOERR     0	/* No error */
+#define ANDNS_RCODE_EINTRPRT  1	/* Intepret error */
+#define ANDNS_RCODE_ESRVFAIL  2	/* Server failure */
+#define ANDNS_RCODE_ENSDMN    3	/* No such domain */
+#define ANDNS_RCODE_ENIMPL    4	/* Not implemented */
+#define ANDNS_RCODE_ERFSD     5	/* Refused */
 /* REALMS TO SEARCH */
 #define NTK_REALM               1
 #define INET_REALM              2
@@ -113,24 +111,25 @@ typedef struct andns_pkt
 #define ANDNS_IPV4		0
 #define ANDNS_IPV6		1
 
-int andns_compress(char *src,int srclen);
-char* andns_uncompress(char *src,int srclen,int *dstlen) ;
-int a_hdr_u(char *buf,andns_pkt *ap);
-int a_qst_u(char *buf,andns_pkt *ap,int limitlen);
-int a_answ_u(char *buf,andns_pkt *ap,int limitlen);
-int a_answs_u(char *buf,andns_pkt *ap,int limitlen);
-int a_u(char *buf,int pktlen,andns_pkt **app);
-int a_hdr_p(andns_pkt *ap,char *buf);
-int a_qst_p(andns_pkt *ap,char *buf,int limitlen);
-int a_answ_p(andns_pkt *ap,andns_pkt_data *apd,char *buf,int limitlen);
-int a_answs_p(andns_pkt *ap,char *buf, int limitlen);
-int a_p(andns_pkt *ap, char *buf);
-andns_pkt* create_andns_pkt(void);
-andns_pkt_data* create_andns_pkt_data(void);
-andns_pkt_data* andns_add_answ(andns_pkt *ap);
-void destroy_andns_pkt_data(andns_pkt_data *apd);
-void andns_del_answ(andns_pkt *ap);
-void destroy_andns_pkt_datas(andns_pkt *ap);
-void destroy_andns_pkt(andns_pkt *ap);
+int andns_compress(char *src, int srclen);
+char *andns_uncompress(char *src, int srclen, int *dstlen);
+int a_hdr_u(char *buf, andns_pkt * ap);
+int a_qst_u(char *buf, andns_pkt * ap, int limitlen);
+int a_answ_u(char *buf, andns_pkt * ap, int limitlen);
+int a_answs_u(char *buf, andns_pkt * ap, int limitlen);
+int a_u(char *buf, int pktlen, andns_pkt ** app);
+int a_hdr_p(andns_pkt * ap, char *buf);
+int a_qst_p(andns_pkt * ap, char *buf, int limitlen);
+int a_answ_p(andns_pkt * ap, andns_pkt_data * apd, char *buf,
+			 int limitlen);
+int a_answs_p(andns_pkt * ap, char *buf, int limitlen);
+int a_p(andns_pkt * ap, char *buf);
+andns_pkt *create_andns_pkt(void);
+andns_pkt_data *create_andns_pkt_data(void);
+andns_pkt_data *andns_add_answ(andns_pkt * ap);
+void destroy_andns_pkt_data(andns_pkt_data * apd);
+void andns_del_answ(andns_pkt * ap);
+void destroy_andns_pkt_datas(andns_pkt * ap);
+void destroy_andns_pkt(andns_pkt * ap);
 
-#endif /* ANDNS_LIB_H */
+#endif							/* ANDNS_LIB_H */

src/andns_net.c

@@ -1,4 +1,4 @@
-	         /**************************************
+			 /**************************************
 	        *     AUTHOR: Federico Tomassini        *
 	       *     Copyright (C) Federico Tomassini    *
 	      *     Contact effetom@gmail.com             *
@@ -21,116 +21,128 @@
 #include "log.h"
 #include "andns_net.h"
 
-int idp_inet_ntop(int family,struct sockaddr *addr,char *buf,int buflen)
+int
+idp_inet_ntop(int family, struct sockaddr *addr, char *buf, int buflen)
 {
 	const char *res;
 	struct sockaddr_in *saddr;
 	struct sockaddr_in6 *saddr6;
 
-	switch(family) {
-		case AF_INET:
-			saddr=(struct sockaddr_in*)addr;
-			res=inet_ntop(family,(void*)(&(saddr->sin_addr)),buf,buflen);
-			break;
-		case AF_INET6:
-			saddr6=(struct sockaddr_in6*)addr;
-			res=inet_ntop(family,(void*)(&(saddr6->sin6_addr)),buf,buflen);
-			break;
-		default:
-			return -1;
+	switch (family) {
+	case AF_INET:
+		saddr = (struct sockaddr_in *) addr;
+		res =
+			inet_ntop(family, (void *) (&(saddr->sin_addr)), buf, buflen);
+		break;
+	case AF_INET6:
+		saddr6 = (struct sockaddr_in6 *) addr;
+		res =
+			inet_ntop(family, (void *) (&(saddr6->sin6_addr)), buf,
+					  buflen);
+		break;
+	default:
+		return -1;
 	}
 	if (!res)
 		return -1;
 	return 0;
 }
+
 /* Connection Layer */
 
-int w_socket(int family,int type, int proto,int die)
+int
+w_socket(int family, int type, int proto, int die)
 {
 	int sk;
-	sk=socket(family,type,proto);
-	if (sk==-1) {
+	sk = socket(family, type, proto);
+	if (sk == -1) {
 		if (die)
-			fatal("w_socket: %s.",strerror(errno));
-		debug(DBG_NORMAL,"w_socket: %s.",strerror(errno));
+			fatal("w_socket: %s.", strerror(errno));
+		debug(DBG_NORMAL, "w_socket: %s.", strerror(errno));
 		return -1;
 	}
 	return sk;
 }
 
-int w_connect(struct addrinfo *ai,int die) 
+int
+w_connect(struct addrinfo *ai, int die)
 {
-	int sk,res;
-	sk=w_socket(ai->ai_family,ai->ai_socktype,ai->ai_protocol,die);
-	res=connect(sk,ai->ai_addr,ai->ai_addrlen);
-	if (!res) 
+	int sk, res;
+	sk = w_socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol, die);
+	res = connect(sk, ai->ai_addr, ai->ai_addrlen);
+	if (!res)
 		return sk;
 	if (die)
 		fatal("Unable to connect: %s.", strerror(errno));
-	debug(DBG_NORMAL,"w_connect: %s.",strerror(errno));
+	debug(DBG_NORMAL, "w_connect: %s.", strerror(errno));
 	close(sk);
 	return -1;
 }
-int serial_connect(struct addrinfo *ai,int die)
+
+int
+serial_connect(struct addrinfo *ai, int die)
 {
 	int res;
 	struct addrinfo *temp;
 
-	temp=ai;
+	temp = ai;
 	if (!temp) {
 		if (die)
 			fatal("Unable to connect: no host specified.");
-		debug(DBG_NORMAL,"serial_connect: no host specified.");
+		debug(DBG_NORMAL, "serial_connect: no host specified.");
 		return -1;
 	}
 	do {
-		res=w_connect(temp,0);
-		temp=temp->ai_next;
-	} while (res==-1 && temp);
-	if (res==-1)  {
+		res = w_connect(temp, 0);
+		temp = temp->ai_next;
+	} while (res == -1 && temp);
+	if (res == -1) {
 		if (die)
 			fatal("Unable to connect.");
-		debug(DBG_NORMAL,"serial_connect: unable to connect.");
+		debug(DBG_NORMAL, "serial_connect: unable to connect.");
 		return -1;
 	}
 	return res;
 }
-	
+
 /*
  * host_connect returns a connected socket to (host,port)
  * endpoint. It is protocol independent.
  * -1 on error.
  */
-int host_connect(const char *host,uint16_t port,int type,int die) 
+int
+host_connect(const char *host, uint16_t port, int type, int die)
 {
 	int res;
 	char portstr[6];
-	struct addrinfo *ai,filter;
+	struct addrinfo *ai, filter;
 
-	memset(&filter,0,sizeof(struct addrinfo));
-	filter.ai_socktype=type;
+	memset(&filter, 0, sizeof(struct addrinfo));
+	filter.ai_socktype = type;
 	if (!host)
 		fatal("w_connect: malicious call.");
-	memset(portstr,0,6);
-	res=snprintf(portstr,6,"%d",port);
-	if (res<0 || res>=6) {
+	memset(portstr, 0, 6);
+	res = snprintf(portstr, 6, "%d", port);
+	if (res < 0 || res >= 6) {
 		printf("Depousceve\n");
 		return -1;
 	}
-	res=getaddrinfo(host,portstr,&filter,&ai);
-	if (res!=0) {
-		printf("w_connect: error %s.\n",gai_strerror(errno));
+	res = getaddrinfo(host, portstr, &filter, &ai);
+	if (res != 0) {
+		printf("w_connect: error %s.\n", gai_strerror(errno));
 		return -1;
 	}
-	res=serial_connect(ai,die);
+	res = serial_connect(ai, die);
 	freeaddrinfo(ai);
 	return res;
 }
-int ai_connect(struct addrinfo *ai,int die,int free_ai)
+
+int
+ai_connect(struct addrinfo *ai, int die, int free_ai)
 {
 	int res;
 
-	res=serial_connect(ai,die);
+	res = serial_connect(ai, die);
 	if (free_ai)
 		freeaddrinfo(ai);
 	return res;
@@ -138,28 +150,30 @@ int ai_connect(struct addrinfo *ai,int die,int free_ai)
 
 /* Communication Layer */
 
-ssize_t w_send(int sk,const void *buf,size_t len,int die) 
+ssize_t
+w_send(int sk, const void *buf, size_t len, int die)
 {
 	ssize_t ret;
 
-	ret=send(sk,buf,len,0);
-	if (ret!=len) {
+	ret = send(sk, buf, len, 0);
+	if (ret != len) {
 		if (die)
-			fatal("Unable to send(): %s.",strerror(errno));
-		debug(DBG_NORMAL,"w_send(): %s.",strerror(errno));
+			fatal("Unable to send(): %s.", strerror(errno));
+		debug(DBG_NORMAL, "w_send(): %s.", strerror(errno));
 	}
 	return ret;
 }
 
-ssize_t w_recv(int sk,void *buf,size_t len,int die)
+ssize_t
+w_recv(int sk, void *buf, size_t len, int die)
 {
 	ssize_t ret;
 
-	ret=recv(sk,buf,len,0);
-	if (ret<=0) {
+	ret = recv(sk, buf, len, 0);
+	if (ret <= 0) {
 		if (die)
-			fatal("Unable to recv(): %s.",strerror(errno));
-		debug(DBG_INSANE,"w_recv(): %s.",strerror(errno));
+			fatal("Unable to recv(): %s.", strerror(errno));
+		debug(DBG_INSANE, "w_recv(): %s.", strerror(errno));
 	}
 	return ret;
 }
@@ -177,121 +191,129 @@ do{                                                                     \
         (t).tv_usec=((x) - ((x)/1000)*1000)*1000;                       \
 }while(0)
 
-ssize_t w_send_timeout(int s,const void *buf,size_t len,int die,int timeout)
+ssize_t
+w_send_timeout(int s, const void *buf, size_t len, int die, int timeout)
 {
-        struct timeval timeout_t;
-        fd_set fdset;
-        int ret;
+	struct timeval timeout_t;
+	fd_set fdset;
+	int ret;
 
-        MILLISEC_TO_TV(timeout*1000, timeout_t);
+	MILLISEC_TO_TV(timeout * 1000, timeout_t);
 
-        FD_ZERO(&fdset);
-        FD_SET(s, &fdset);
+	FD_ZERO(&fdset);
+	FD_SET(s, &fdset);
 
-        ret = select(s+1, &fdset, NULL, NULL, &timeout_t);
-        if (ret == -1) {
+	ret = select(s + 1, &fdset, NULL, NULL, &timeout_t);
+	if (ret == -1) {
 		if (die)
 			fatal("send(): select error.");
-		debug(DBG_NORMAL,"send(): select error.");
+		debug(DBG_NORMAL, "send(): select error.");
 		return ret;
-        }
+	}
 
-        if(FD_ISSET(s, &fdset))
-                return w_send(s, buf, len, die);
-        return -1;
+	if (FD_ISSET(s, &fdset))
+		return w_send(s, buf, len, die);
+	return -1;
 }
 
-ssize_t w_recv_timeout(int s,void *buf,size_t len,int die,int timeout)
+ssize_t
+w_recv_timeout(int s, void *buf, size_t len, int die, int timeout)
 {
-        struct timeval timeout_t;
-        fd_set fdset;
-        int ret;
+	struct timeval timeout_t;
+	fd_set fdset;
+	int ret;
 
-        MILLISEC_TO_TV(timeout*1000, timeout_t);
+	MILLISEC_TO_TV(timeout * 1000, timeout_t);
 
-        FD_ZERO(&fdset);
-        FD_SET(s, &fdset);
+	FD_ZERO(&fdset);
+	FD_SET(s, &fdset);
 
-        ret = select(s+1, NULL, &fdset, NULL, &timeout_t);
+	ret = select(s + 1, NULL, &fdset, NULL, &timeout_t);
 
-        if (ret == -1) {
+	if (ret == -1) {
 		if (die)
 			fatal("recv(): select error.");
-		debug(DBG_NORMAL,"recv(): select error.");
+		debug(DBG_NORMAL, "recv(): select error.");
 		return ret;
-        }
+	}
 
-        if(FD_ISSET(s, &fdset))
-                return w_recv(s, buf, len, die);
-        return -1;
+	if (FD_ISSET(s, &fdset))
+		return w_recv(s, buf, len, die);
+	return -1;
 }
 
 
-	
+
 /* Dialog Layer */
 
 /* "Botta e risposta" */
-ssize_t hn_send_recv_close(const char *host,uint16_t port,int type,void *buf,
-		size_t buflen,void *anbuf,size_t anlen,int die,int timeout)
+ssize_t
+hn_send_recv_close(const char *host, uint16_t port, int type, void *buf,
+				   size_t buflen, void *anbuf, size_t anlen, int die,
+				   int timeout)
 {
 	ssize_t ret;
 	int res;
 
-	res=host_connect(host,port,type,die);
-	if (res==-1) 
+	res = host_connect(host, port, type, die);
+	if (res == -1)
 		return -1;
 	if (timeout)
-		ret=w_send_timeout(res,buf,buflen,die,timeout);
+		ret = w_send_timeout(res, buf, buflen, die, timeout);
 	else
-		ret=w_send(res,buf,buflen,die);
-	if (ret==-1) 
+		ret = w_send(res, buf, buflen, die);
+	if (ret == -1)
 		return -2;
 	if (timeout)
-		ret=w_recv_timeout(res,anbuf,anlen,die,timeout);
+		ret = w_recv_timeout(res, anbuf, anlen, die, timeout);
 	else
-		ret=w_recv(res,anbuf,anlen,die);
-	if (ret==-1)
+		ret = w_recv(res, anbuf, anlen, die);
+	if (ret == -1)
 		return -3;
 	close(res);
 	return ret;
 }
+
 /* "Botta e risposta" */
-ssize_t ai_send_recv_close(struct addrinfo *ai,void *buf,size_t buflen,
-		void *anbuf,size_t anlen,int die,int free_ai,int timeout)
+ssize_t
+ai_send_recv_close(struct addrinfo * ai, void *buf, size_t buflen,
+				   void *anbuf, size_t anlen, int die, int free_ai,
+				   int timeout)
 {
 	ssize_t ret;
 	int res;
 
-	res=ai_connect(ai,die,free_ai);
-	if (res==-1) 
+	res = ai_connect(ai, die, free_ai);
+	if (res == -1)
 		return -1;
 	if (timeout)
-		ret=w_send_timeout(res,buf,buflen,die,timeout);
+		ret = w_send_timeout(res, buf, buflen, die, timeout);
 	else
-		ret=w_send(res,buf,buflen,die);
-	if (ret==-1) 
+		ret = w_send(res, buf, buflen, die);
+	if (ret == -1)
 		return -2;
 	if (timeout)
-		ret=w_recv_timeout(res,anbuf,anlen,die,timeout);
+		ret = w_recv_timeout(res, anbuf, anlen, die, timeout);
 	else
-		ret=w_recv(res,anbuf,anlen,die);
-	if (ret==-1) 
+		ret = w_recv(res, anbuf, anlen, die);
+	if (ret == -1)
 		return -3;
 	close(res);
 	return ret;
 }
-	
-void char_print(char *buf, int len)
+
+void
+char_print(char *buf, int len)
 {
-        int i,count=0;
-
-        printf("Printing %d bytes\n",len);
-        for (i=0;i<len;i++) {
-                printf("%02X ", (unsigned char)(buf[i]));
-                count++;
-                if ((count%16)==0) printf("\n");
-        }
-        printf("\n");
-        return;
+	int i, count = 0;
+
+	printf("Printing %d bytes\n", len);
+	for (i = 0; i < len; i++) {
+		printf("%02X ", (unsigned char) (buf[i]));
+		count++;
+		if ((count % 16) == 0)
+			printf("\n");
+	}
+	printf("\n");
+	return;
 }
-

src/andns_net.h

@@ -1,3 +1,23 @@
+			 /**************************************
+	        *     AUTHOR: Federico Tomassini        *
+	       *     Copyright (C) Federico Tomassini    *
+	      *     Contact effetom@gmail.com             *
+	     ***********************************************
+	     *******          BEGIN 4/2006          ********
+*************************************************************************
+*                                              				* 
+*  This program is free software; you can redistribute it and/or modify	*
+*  it under the terms of the GNU General Public License as published by	*
+*  the Free Software Foundation; either version 2 of the License, or	*
+*  (at your option) any later version.					*
+*									*
+*  This program is distributed in the hope that it will be useful,	*
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of	*
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	*
+*  GNU General Public License for more details.				*
+*									*
+************************************************************************/
+
 #ifndef ANDNS_NET_H
 #define ANDNS_NET_H
 
@@ -12,21 +32,25 @@
 
 
 
-int idp_inet_ntop(int family,struct sockaddr *addr,char *buf,int buflen);
-int w_socket(int family,int type, int proto,int die);
-int w_connect(struct addrinfo *ai,int die) ;
-int serial_connect(struct addrinfo *ai,int die);
-int host_connect(const char *host,uint16_t port,int type,int die) ;
-int ai_connect(struct addrinfo *ai,int die,int free_ai);
-ssize_t w_send(int sk,const void *buf,size_t len,int die) ;
-ssize_t w_recv(int sk,void *buf,size_t len,int die);
-ssize_t w_send_timeout(int s,const void *buf,size_t len,int die,int timeout);
-ssize_t w_recv_timeout(int s,void *buf,size_t len,int die,int timeout);
-ssize_t ai_send_recv_close(struct addrinfo *ai,void *buf,size_t buflen,
-		void *anbuf,size_t anlen,int die,int free_ai,int timeout);
-ssize_t hn_send_recv_close(const char *host,uint16_t port,int type,void *buf,
-	        size_t buflen,void *anbuf,size_t anlen,int die,int timeout);
+int idp_inet_ntop(int family, struct sockaddr *addr, char *buf,
+				  int buflen);
+int w_socket(int family, int type, int proto, int die);
+int w_connect(struct addrinfo *ai, int die);
+int serial_connect(struct addrinfo *ai, int die);
+int host_connect(const char *host, uint16_t port, int type, int die);
+int ai_connect(struct addrinfo *ai, int die, int free_ai);
+ssize_t w_send(int sk, const void *buf, size_t len, int die);
+ssize_t w_recv(int sk, void *buf, size_t len, int die);
+ssize_t w_send_timeout(int s, const void *buf, size_t len, int die,
+					   int timeout);
+ssize_t w_recv_timeout(int s, void *buf, size_t len, int die, int timeout);
+ssize_t ai_send_recv_close(struct addrinfo *ai, void *buf, size_t buflen,
+						   void *anbuf, size_t anlen, int die, int free_ai,
+						   int timeout);
+ssize_t hn_send_recv_close(const char *host, uint16_t port, int type,
+						   void *buf, size_t buflen, void *anbuf,
+						   size_t anlen, int die, int timeout);
 void char_print(char *buf, int len);
 
 
-#endif /* ANDNS_NET_H */
+#endif							/* ANDNS_NET_H */

src/andns_snsd.c

@@ -1,3 +1,23 @@
+			 /**************************************
+	        *     AUTHOR: Federico Tomassini        *
+	       *     Copyright (C) Federico Tomassini    *
+	      *     Contact effetom@gmail.com             *
+	     ***********************************************
+	     *******          BEGIN 4/2006          ********
+*************************************************************************
+*                                              				* 
+*  This program is free software; you can redistribute it and/or modify	*
+*  it under the terms of the GNU General Public License as published by	*
+*  the Free Software Foundation; either version 2 of the License, or	*
+*  (at your option) any later version.					*
+*									*
+*  This program is distributed in the hope that it will be useful,	*
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of	*
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	*
+*  GNU General Public License for more details.				*
+*									*
+************************************************************************/
+
 #include "includes.h"
 
 #include "llist.c"
@@ -19,32 +39,33 @@
  * 	0
  * 	-1
  */
-int snsd_main_ip(u_int *hname_hash,snsd_node *dst)
+int
+snsd_main_ip(u_int * hname_hash, snsd_node * dst)
 {
 	snsd_service *ss;
 	snsd_prio *sp;
 	snsd_node *sn;
 	int records;
 
-	ss=andna_resolve_hash(hname_hash,0,0,&records);
-	if (!ss) 
-		err_ret(ERR_SNDMRF,-1);
-	if (!(sp=ss->prio)) {
+	ss = andna_resolve_hash(hname_hash, 0, 0, &records);
+	if (!ss)
+		err_ret(ERR_SNDMRF, -1);
+	if (!(sp = ss->prio)) {
 		goto destroy_return;
 	}
 	list_for(sp) {
-		sn=sp->node;
-		list_for(sn) 
+		sn = sp->node;
+		list_for(sn)
 			if (sn->flags & SNSD_NODE_MAIN_IP) {
-				memcpy(dst,sn,sizeof(snsd_node));
-				snsd_service_llist_del(&ss);
-				return 0;
-			}
+			memcpy(dst, sn, sizeof(snsd_node));
+			snsd_service_llist_del(&ss);
+			return 0;
+		}
 	}
 	goto destroy_return;
-destroy_return:
+  destroy_return:
 	snsd_service_llist_del(&ss);
-	err_ret(ERR_SNDMRF,-1);
+	err_ret(ERR_SNDMRF, -1);
 }
 
 /*
@@ -56,34 +77,36 @@ destroy_return:
  * 	bytes writed
  * 	
  */
-int snsd_node_to_data(char *buf,snsd_node *sn,u_char prio,int iplen,int recursion)
+int
+snsd_node_to_data(char *buf, snsd_node * sn, u_char prio, int iplen,
+				  int recursion)
 {
 	int res;
 	int family;
 
-	if (recursion!=-1) {
-		*buf|=sn->weight&0x3f;
-		*(buf+1)|=prio;
+	if (recursion != -1) {
+		*buf |= sn->weight & 0x3f;
+		*(buf + 1) |= prio;
 	}
 
-        if (! (sn->flags & SNSD_NODE_HNAME)) {
-		*buf|=0x40;
-		if (sn->flags & SNSD_NODE_MAIN_IP )
-			*buf|=0x80;
-                memcpy(buf+2,sn->record,iplen); 
-		family=(iplen==4)?AF_INET:AF_INET6;
-		inet_htonl((u_int*)(buf+2),family);
-		return iplen+2;
-        } else if (recursion) {
-                snsd_node snt;
-                res=snsd_main_ip(sn->record,&snt);
-		if (!res) { /* I love recursion */
-                	res=snsd_node_to_data(buf,&snt,prio,iplen,-1);
+	if (!(sn->flags & SNSD_NODE_HNAME)) {
+		*buf |= 0x40;
+		if (sn->flags & SNSD_NODE_MAIN_IP)
+			*buf |= 0x80;
+		memcpy(buf + 2, sn->record, iplen);
+		family = (iplen == 4) ? AF_INET : AF_INET6;
+		inet_htonl((u_int *) (buf + 2), family);
+		return iplen + 2;
+	} else if (recursion) {
+		snsd_node snt;
+		res = snsd_main_ip(sn->record, &snt);
+		if (!res) {				/* I love recursion */
+			res = snsd_node_to_data(buf, &snt, prio, iplen, -1);
 			return res;
 		}
 	}
-	memcpy(buf+2,sn->record,ANDNS_HASH_H);
-	return ANDNS_HASH_H+2;
+	memcpy(buf + 2, sn->record, ANDNS_HASH_H);
+	return ANDNS_HASH_H + 2;
 }
 
 /*
@@ -125,30 +148,34 @@ size_t snsd_node_to_aansw(char *buf,snsd_node *sn,u_char prio,int iplen)
  * in prio list and take ANDNS_MAX_ANSW_IP_LEN * n space.
  *
  */
-int snsd_prio_to_aansws(char *buf,snsd_prio *sp,int iplen,int recursion,int *count)
+int
+snsd_prio_to_aansws(char *buf, snsd_prio * sp, int iplen, int recursion,
+					int *count)
 {
-	int res=0;
+	int res = 0;
 	snsd_node *sn;
-	int c=0;
-	
-	if(!sp || !buf)
+	int c = 0;
+
+	if (!sp || !buf)
 		return 0;
 
-	sn=sp->node;
-	list_for(sn) { 
-		res+=snsd_node_to_data(buf+res,sn,sp->prio,
-			iplen,recursion);
+	sn = sp->node;
+	list_for(sn) {
+		res += snsd_node_to_data(buf + res, sn, sp->prio,
+								 iplen, recursion);
 		c++;
 	}
-	*count=c;
+	*count = c;
 	return res;
 }
 
-int snsd_service_to_aansws(char *buf,snsd_service *ss,int iplen,int *count,int recursion)
+int
+snsd_service_to_aansws(char *buf, snsd_service * ss, int iplen, int *count,
+					   int recursion)
 {
-	int family,c=0;
+	int family, c = 0;
 	uint16_t service;
-	uint8_t prio,proto;
+	uint8_t prio, proto;
 	snsd_prio *sp;
 	snsd_node *sn;
 	char *rem;
@@ -156,42 +183,42 @@ int snsd_service_to_aansws(char *buf,snsd_service *ss,int iplen,int *count,int r
 
 	if (!ss || !buf)
 		return 0;
-	rem=buf;
-	
+	rem = buf;
+
 	list_for(ss) {
-		service=htons(ss->service);
-		proto=ss->proto;
-		sp=ss->prio;
+		service = htons(ss->service);
+		proto = ss->proto;
+		sp = ss->prio;
 		list_for(sp) {
-			prio=sp->prio;
-			sn=sp->node;
+			prio = sp->prio;
+			sn = sp->node;
 			list_for(sn) {
 				if (sn->flags & SNSD_NODE_MAIN_IP)
-					(*buf)|=0xc0;
+					(*buf) |= 0xc0;
 				else if (sn->flags & SNSD_NODE_IP)
-					(*buf)|=0x40;
-				if (proto==ANDNS_SNSD_PROTO_UDP)
-					(*buf)|=0x20;
-				*buf++|=(sn->weight&0x1f);
-				*buf++|=prio;
-				memcpy(buf,&service,2);
-				buf+=2;
+					(*buf) |= 0x40;
+				if (proto == ANDNS_SNSD_PROTO_UDP)
+					(*buf) |= 0x20;
+				*buf++ |= (sn->weight & 0x1f);
+				*buf++ |= prio;
+				memcpy(buf, &service, 2);
+				buf += 2;
 				if (sn->flags & SNSD_NODE_MAIN_IP ||
-				    sn->flags & SNSD_NODE_IP ) {
-                			memcpy(buf,sn->record,iplen); 
-					family=(iplen==4)?AF_INET:AF_INET6;
-					inet_htonl((u_int*)buf,family);
-					buf+=iplen;
-				} else { 
-					if (recursion && !snsd_main_ip(sn->record,&snt)) {
-						memcpy(buf,snt.record,iplen);
-						*(buf-4)|=0x40;
-						family=(iplen==4)?AF_INET:AF_INET6;
-						inet_htonl((u_int*)buf,family);
-						buf+=iplen;
+					sn->flags & SNSD_NODE_IP) {
+					memcpy(buf, sn->record, iplen);
+					family = (iplen == 4) ? AF_INET : AF_INET6;
+					inet_htonl((u_int *) buf, family);
+					buf += iplen;
+				} else {
+					if (recursion && !snsd_main_ip(sn->record, &snt)) {
+						memcpy(buf, snt.record, iplen);
+						*(buf - 4) |= 0x40;
+						family = (iplen == 4) ? AF_INET : AF_INET6;
+						inet_htonl((u_int *) buf, family);
+						buf += iplen;
 					} else {
-						memcpy(buf,sn->record, ANDNS_HASH_H);
-						buf+=ANDNS_HASH_H;
+						memcpy(buf, sn->record, ANDNS_HASH_H);
+						buf += ANDNS_HASH_H;
 					}
 /*					service=strlen((char*)sn->record);
 					temp=htons(service);
@@ -212,79 +239,82 @@ int snsd_service_to_aansws(char *buf,snsd_service *ss,int iplen,int *count,int r
 			}
 		}
 	}
-	*count=c;
-	return (int)(buf-rem);
+	*count = c;
+	return (int) (buf - rem);
 }
-					
-				
-				
+
+
+
 /*
  * Given a dns_packet, this function add an answer to it
  * and returns 0;
  * Otherwise returns -1.
  */
-int snsd_node_to_dansw(dns_pkt *dp,snsd_node *sn,int iplen)
+int
+snsd_node_to_dansw(dns_pkt * dp, snsd_node * sn, int iplen)
 {
 	char temp[18];
 	dns_pkt_a *dpa;
-	snsd_node snt,*s;
+	snsd_node snt, *s;
 	int res;
 
 	if (!(sn->flags & SNSD_NODE_HNAME)) {
-		if (!(res=snsd_main_ip(sn->record,&snt)))
+		if (!(res = snsd_main_ip(sn->record, &snt)))
 			return -1;
-		s=&snt;
-	} else 
-		s=sn;
-
-        memcpy(temp,sn->record,iplen);
-        inet_htonl((u_int*)(temp),
-		(iplen==4)?AF_INET:AF_INET6);
-			
-	dpa=DP_ADD_ANSWER(dp);
-	dns_a_default_fill(dp,dpa);
-	dpa->rdlength=iplen;
-	memcpy(dpa->rdata,temp,iplen);
+		s = &snt;
+	} else
+		s = sn;
+
+	memcpy(temp, sn->record, iplen);
+	inet_htonl((u_int *) (temp), (iplen == 4) ? AF_INET : AF_INET6);
+
+	dpa = DP_ADD_ANSWER(dp);
+	dns_a_default_fill(dp, dpa);
+	dpa->rdlength = iplen;
+	memcpy(dpa->rdata, temp, iplen);
 	return 0;
 }
+
 /*
  * Converts a snsd_prio struct, adding a set of answers to
  * the dns_packet dp.
  * Returns the number of answers added to dp.
  */
-int snsd_prio_to_dansws(dns_pkt *dp,snsd_prio *sp,int iplen)
+int
+snsd_prio_to_dansws(dns_pkt * dp, snsd_prio * sp, int iplen)
 {
-	int res=0;
+	int res = 0;
 	snsd_node *sn;
-	
-	sn=sp->node;
-	list_for(sn) 
-		if (!snsd_node_to_dansw(dp,sn,iplen))
-			res++;
+
+	sn = sp->node;
+	list_for(sn)
+		if (!snsd_node_to_dansw(dp, sn, iplen))
+		res++;
 	return res;
 }
-		
-		
-		
+
+
+
 	/* ip2h functions */
 
 /*
  * Converts a lcl_cache struct to a set of dns answers.
  * Returns the number of answers added.
  */
-int lcl_cache_to_dansws(dns_pkt *dp,lcl_cache *lc)
+int
+lcl_cache_to_dansws(dns_pkt * dp, lcl_cache * lc)
 {
 	dns_pkt_a *dpa;
-	int res=0;
-	
+	int res = 0;
+
 	list_for(lc) {
-		dpa=DP_ADD_ANSWER(dp);
-		dns_a_default_fill(dp,dpa);
-		strcpy(dpa->rdata,lc->hostname);
+		dpa = DP_ADD_ANSWER(dp);
+		dns_a_default_fill(dp, dpa);
+		strcpy(dpa->rdata, lc->hostname);
 		res++;
 	}
 
-	if(lc)
+	if (lc)
 		lcl_cache_free(lc);
 
 	return res;
@@ -294,23 +324,24 @@ int lcl_cache_to_dansws(dns_pkt *dp,lcl_cache *lc)
  * Converts a lcl_cache to andns data. 
  * Returns the number of bytes writed.
  */
-size_t lcl_cache_to_aansws(char *buf,lcl_cache *lc,int *count)
+size_t
+lcl_cache_to_aansws(char *buf, lcl_cache * lc, int *count)
 {
 	uint16_t slen;
-	size_t ret=0;
-	int lcount=0;
-	lcl_cache *lcl=lc;
-	
+	size_t ret = 0;
+	int lcount = 0;
+	lcl_cache *lcl = lc;
+
 	list_for(lcl) {
-		slen=strlen(lc->hostname);
-		ret+=2+slen;
-		slen=htons(slen);
-		memcpy(buf,&slen,2);
-		buf+=2;
-		strcpy(buf,lc->hostname);
+		slen = strlen(lc->hostname);
+		ret += 2 + slen;
+		slen = htons(slen);
+		memcpy(buf, &slen, 2);
+		buf += 2;
+		strcpy(buf, lc->hostname);
 		lcount++;
 	}
-	*count=lcount;
+	*count = lcount;
 	lcl_cache_free(lc);
 	return ret;
 }

src/andns_snsd.h

@@ -1,3 +1,23 @@
+			 /**************************************
+	        *     AUTHOR: Federico Tomassini        *
+	       *     Copyright (C) Federico Tomassini    *
+	      *     Contact effetom@gmail.com             *
+	     ***********************************************
+	     *******          BEGIN 4/2006          ********
+*************************************************************************
+*                                              				* 
+*  This program is free software; you can redistribute it and/or modify	*
+*  it under the terms of the GNU General Public License as published by	*
+*  the Free Software Foundation; either version 2 of the License, or	*
+*  (at your option) any later version.					*
+*									*
+*  This program is distributed in the hope that it will be useful,	*
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of	*
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the	*
+*  GNU General Public License for more details.				*
+*									*
+************************************************************************/
+
 #ifndef ANDNS_SNSD_H
 #define ANDNS_SNSD_H
 
@@ -10,13 +30,17 @@
 
 /* functions */
 
-int snsd_main_ip(u_int *hname_hash,snsd_node *dst);
-int snsd_node_to_data(char *buf,snsd_node *sn,u_char prio,int iplen,int recursion);
-size_t snsd_node_to_aansw(char *buf,snsd_node *sn,u_char prio,int iplen);
-int snsd_prio_to_aansws(char *buf,snsd_prio *sp,int iplen,int recursion,int *count);
-int snsd_service_to_aansws(char *buf,snsd_service *ss,int iplen,int *count,int recursion);
-int snsd_node_to_dansw(dns_pkt *dp,snsd_node *sn,int iplen);
-int snsd_prio_to_dansws(dns_pkt *dp,snsd_prio *sp,int iplen);
-int lcl_cache_to_dansws(dns_pkt *dp,lcl_cache *lc);
-size_t lcl_cache_to_aansws(char *buf,lcl_cache *lc,int *count);
-#endif /* ANDNS_SNSD_H */
+int snsd_main_ip(u_int * hname_hash, snsd_node * dst);
+int snsd_node_to_data(char *buf, snsd_node * sn, u_char prio, int iplen,
+					  int recursion);
+size_t snsd_node_to_aansw(char *buf, snsd_node * sn, u_char prio,
+						  int iplen);
+int snsd_prio_to_aansws(char *buf, snsd_prio * sp, int iplen,
+						int recursion, int *count);
+int snsd_service_to_aansws(char *buf, snsd_service * ss, int iplen,
+						   int *count, int recursion);
+int snsd_node_to_dansw(dns_pkt * dp, snsd_node * sn, int iplen);
+int snsd_prio_to_dansws(dns_pkt * dp, snsd_prio * sp, int iplen);
+int lcl_cache_to_dansws(dns_pkt * dp, lcl_cache * lc);
+size_t lcl_cache_to_aansws(char *buf, lcl_cache * lc, int *count);
+#endif							/* ANDNS_SNSD_H */

src/bmap.c

@@ -29,37 +29,43 @@
 #include "gmap.h"
 #include "bmap.h"
 
-void bmap_levels_init(u_char levels, map_bnode ***bmap, u_int **bmap_nodes)
+void
+bmap_levels_init(u_char levels, map_bnode *** bmap, u_int ** bmap_nodes)
 {
-	*bmap=xmalloc(sizeof(map_bnode *) * levels);
-	*bmap_nodes=(u_int *)xmalloc(sizeof(u_int) * levels);
+	*bmap = xmalloc(sizeof(map_bnode *) * levels);
+	*bmap_nodes = (u_int *) xmalloc(sizeof(u_int) * levels);
 
 	setzero(*bmap, sizeof(map_bnode *) * levels);
 	bmap_counter_reset(levels, *bmap_nodes);
 }
 
-void bmap_levels_free(map_bnode **bmap, u_int *bmap_nodes)
+void
+bmap_levels_free(map_bnode ** bmap, u_int * bmap_nodes)
 {
 	xfree(bmap);
 	xfree(bmap_nodes);
 }
 
-void bmap_counter_init(u_char levels, u_int **bnodes_closed, u_int **bnodes_opened)
+void
+bmap_counter_init(u_char levels, u_int ** bnodes_closed,
+				  u_int ** bnodes_opened)
 {
-	*bnodes_closed=(u_int *)xmalloc(sizeof(u_int) * levels);
-	*bnodes_opened=(u_int *)xmalloc(sizeof(u_int) * levels);
-	
+	*bnodes_closed = (u_int *) xmalloc(sizeof(u_int) * levels);
+	*bnodes_opened = (u_int *) xmalloc(sizeof(u_int) * levels);
+
 	bmap_counter_reset(levels, *bnodes_closed);
 	bmap_counter_reset(levels, *bnodes_opened);
 }
 
-void bmap_counter_free(u_int *bnodes_closed, u_int *bnodes_opened)
+void
+bmap_counter_free(u_int * bnodes_closed, u_int * bnodes_opened)
 {
 	xfree(bnodes_closed);
 	xfree(bnodes_opened);
 }
 
-void bmap_counter_reset(u_char levels, u_int *counter)
+void
+bmap_counter_reset(u_char levels, u_int * counter)
 {
 	setzero(counter, sizeof(u_int) * levels);
 }
@@ -70,22 +76,24 @@ void bmap_counter_reset(u_char levels, u_int *counter)
  * to `bnode' and the links to `links'.
  * Note that the `bmap' argument must be an adress of a pointer.
  */
-int map_add_bnode(map_bnode **bmap, u_int *bmap_nodes, u_int bnode, u_int links)
+int
+map_add_bnode(map_bnode ** bmap, u_int * bmap_nodes, u_int bnode,
+			  u_int links)
 {
 	map_bnode *bnode_map;
 	u_int bm;
-	
-	bm=*bmap_nodes; 
+
+	bm = *bmap_nodes;
 	(*bmap_nodes)++;
-	if(!bm)
-		*bmap=xmalloc(sizeof(map_bnode));
+	if (!bm)
+		*bmap = xmalloc(sizeof(map_bnode));
 	else
-		*bmap=xrealloc(*bmap, sizeof(map_bnode) * *bmap_nodes);
+		*bmap = xrealloc(*bmap, sizeof(map_bnode) * *bmap_nodes);
 
-	bnode_map=*bmap;
+	bnode_map = *bmap;
 	setzero(bnode_map, sizeof(map_bnode));
-	bnode_map[bm].bnode_ptr=bnode;
-	bnode_map[bm].links=links;
+	bnode_map[bm].bnode_ptr = bnode;
+	bnode_map[bm].links = links;
 	return bm;
 }
 
@@ -93,18 +101,20 @@ int map_add_bnode(map_bnode **bmap, u_int *bmap_nodes, u_int bnode, u_int links)
  * map_bnode_del: It deletes the `bnode' in the `bmap' which has `bmap_nodes'.
  * It returns the newly rescaled `bmap'.
  * It returns 0 if the `bmap' doesn't exist anymore.*/
-map_bnode *map_bnode_del(map_bnode *bmap, u_int *bmap_nodes,  map_bnode *bnode)
+map_bnode *
+map_bnode_del(map_bnode * bmap, u_int * bmap_nodes, map_bnode * bnode)
 {
-	map_node_del((map_node *)bnode);
-	
-	if( ((char *)bnode-(char *)bmap)/sizeof(map_bnode) != (*bmap_nodes)-1 )
-		memcpy(bnode, &bmap[*bmap_nodes-1], sizeof(map_bnode));
+	map_node_del((map_node *) bnode);
+
+	if (((char *) bnode - (char *) bmap) / sizeof(map_bnode) !=
+		(*bmap_nodes) - 1)
+		memcpy(bnode, &bmap[*bmap_nodes - 1], sizeof(map_bnode));
 
 	(*bmap_nodes)--;
-	if(*bmap_nodes)
+	if (*bmap_nodes)
 		return xrealloc(bmap, (*bmap_nodes) * sizeof(map_bnode));
 	else {
-		*bmap_nodes=0;
+		*bmap_nodes = 0;
 		xfree(bmap);
 		return 0;
 	}
@@ -117,18 +127,19 @@ map_bnode *map_bnode_del(map_bnode *bmap, u_int *bmap_nodes,  map_bnode *bnode)
  * `total_levels' must be equal to the maximum levels 
  * available (use FAMILY_LVLS).
  */
-int bmap_del_rnode_by_level(map_bnode *bnode, int level, map_gnode **ext_map,
-		int total_levels)
-{ 
+int
+bmap_del_rnode_by_level(map_bnode * bnode, int level, map_gnode ** ext_map,
+						int total_levels)
+{
 	map_gnode *gn;
-	int i, ret=0, lvl;
-	
-	
-	for(i=0; i < bnode->links; i++) {
-		gn=(map_gnode *)bnode->r_node[i].r_node;
-		lvl=extmap_find_level(ext_map, gn, total_levels);
-
-		if(lvl != level) {
+	int i, ret = 0, lvl;
+
+
+	for (i = 0; i < bnode->links; i++) {
+		gn = (map_gnode *) bnode->r_node[i].r_node;
+		lvl = extmap_find_level(ext_map, gn, total_levels);
+
+		if (lvl != level) {
 			rnode_del(bnode, i);
 			ret++;
 		}
@@ -141,14 +152,15 @@ int bmap_del_rnode_by_level(map_bnode *bnode, int level, map_gnode **ext_map,
  * map_find_bnode: Find the given `node' (in the pos_from_node() format) in the
  * given map_bnode `bmap'.
  */
-int map_find_bnode(map_bnode *bmap, int bmap_nodes, int node)
+int
+map_find_bnode(map_bnode * bmap, int bmap_nodes, int node)
 {
 	int e;
 
-	for(e=0; e<bmap_nodes; e++)
-		if(bmap[e].bnode_ptr == node)
+	for (e = 0; e < bmap_nodes; e++)
+		if (bmap[e].bnode_ptr == node)
 			return e;
-	
+
 	return -1;
 }
 
@@ -157,12 +169,13 @@ int map_find_bnode(map_bnode *bmap, int bmap_nodes, int node)
  * which points to `n'. If it is found the pos of the bnode in the `bmap' is
  * returned, otherwise -1 is the return value. 
  */
-int map_find_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n)
+int
+map_find_bnode_rnode(map_bnode * bmap, int bmap_nodes, void *n)
 {
 	int e;
 
-	for(e=0; e<bmap_nodes; e++)
-		if(rnode_find((map_node *)&bmap[e], (map_node *)n) != -1)
+	for (e = 0; e < bmap_nodes; e++)
+		if (rnode_find((map_node *) & bmap[e], (map_node *) n) != -1)
 			return e;
 
 	return -1;
@@ -172,12 +185,13 @@ int map_find_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n)
  * map_count_bnode_rnode: counts how many bnode which have a rnode which
  * points to `n' there are in `bmap'.
  */
-int map_count_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n)
+int
+map_count_bnode_rnode(map_bnode * bmap, int bmap_nodes, void *n)
 {
 	int e, i;
 
-	for(i=0, e=0; i<bmap_nodes; i++)
-		if(rnode_find((map_node *)&bmap[i], (map_node *)n) != -1)
+	for (i = 0, e = 0; i < bmap_nodes; i++)
+		if (rnode_find((map_node *) & bmap[i], (map_node *) n) != -1)
 			e++;
 
 	return e;
@@ -188,12 +202,14 @@ int map_count_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n)
  * `bmap' and returns the sum of the results.
  * `levels' are the total levels of `bmap'.
  */
-int bmaps_count_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void *n)
+int
+bmaps_count_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, int levels,
+						void *n)
 {
 	int i, e;
 
-	for(i=0, e=0; i<levels; i++)
-		e+=map_count_bnode_rnode(bmap[i], bmap_nodes[i], n);
+	for (i = 0, e = 0; i < levels; i++)
+		e += map_count_bnode_rnode(bmap[i], bmap_nodes[i], n);
 
 	return e;
 }
@@ -204,19 +220,20 @@ int bmaps_count_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void
  * `bmap' is the address of the pointer to the bmap.
  * It returns the number of rnodes deleted.
  */
-int map_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, void *n)
+int
+map_del_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, void *n)
 {
 	map_bnode *bm;
-	int e, p, ret=0;
+	int e, p, ret = 0;
 
-	bm=*bmap;
-	for(e=0; e < *bmap_nodes; e++) {
-		if((p=rnode_find((map_node *)&bm[e], (map_node *)n)) != -1) {
+	bm = *bmap;
+	for (e = 0; e < *bmap_nodes; e++) {
+		if ((p = rnode_find((map_node *) & bm[e], (map_node *) n)) != -1) {
 			rnode_del(&bm[e], p);
 
-			if(!bm[e].links) {
-				*bmap=map_bnode_del(*bmap,(u_int*)bmap_nodes, &bm[e]);
-				bm=*bmap;
+			if (!bm[e].links) {
+				*bmap = map_bnode_del(*bmap, (u_int *) bmap_nodes, &bm[e]);
+				bm = *bmap;
 			}
 			ret++;
 		}
@@ -231,12 +248,14 @@ int map_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, void *n)
  * `levels' are the total levels of `bmap'.
  * It returns the total number of rnodes deleted
  */
-int bmaps_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void *n)
+int
+bmaps_del_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, int levels,
+					  void *n)
 {
 	int i, e;
 
-	for(i=0, e=0; i<levels; i++)
-		e+=map_del_bnode_rnode(&bmap[i], &bmap_nodes[i], n);
+	for (i = 0, e = 0; i < levels; i++)
+		e += map_del_bnode_rnode(&bmap[i], &bmap_nodes[i], n);
 
 	return e;
 }
@@ -245,22 +264,25 @@ int bmaps_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void *n
  * map_set_bnode_flag: sets the `flags' to all the `bmap_nodes'# present in
  * `bmap'.
  */
-void map_set_bnode_flag(map_bnode *bmap, int bmap_nodes, int flags)
+void
+map_set_bnode_flag(map_bnode * bmap, int bmap_nodes, int flags)
 {
 	int e;
-	for(e=0; e<bmap_nodes; e++)
-		bmap[e].flags|=flags;
+	for (e = 0; e < bmap_nodes; e++)
+		bmap[e].flags |= flags;
 }
 
 /*
  * bmaps_set_bnode_flag: sets the `flags' to all the bnodes present in the
  * `levels'#  `bmap'.
  */
-void bmaps_set_bnode_flag(map_bnode **bmap, int *bmap_nodes, int levels, int flags)
+void
+bmaps_set_bnode_flag(map_bnode ** bmap, int *bmap_nodes, int levels,
+					 int flags)
 {
-	int i;		
-	
-	for(i=0; i<levels; i++)
+	int i;
+
+	for (i = 0; i < levels; i++)
 		map_set_bnode_flag(bmap[i], bmap_nodes[i], flags);
 }
 
@@ -272,35 +294,37 @@ void bmaps_set_bnode_flag(map_bnode **bmap, int *bmap_nodes, int levels, int fla
  * The package will be in network order.
  */
 char *
-pack_all_bmaps(map_bnode **bmaps,  u_int *bmap_nodes, map_gnode **ext_map,
-		quadro_group quadg, size_t *pack_sz)
+pack_all_bmaps(map_bnode ** bmaps, u_int * bmap_nodes,
+			   map_gnode ** ext_map, quadro_group quadg, size_t * pack_sz)
 {
 	struct bnode_maps_hdr bmaps_hdr;
 	size_t sz, tmp_sz[BMAP_LEVELS(quadg.levels)];
 	char *pack[BMAP_LEVELS(quadg.levels)], *final_pack, *buf;
 	u_char level;
 
-	*pack_sz=0;
+	*pack_sz = 0;
 
-	for(level=0; level < BMAP_LEVELS(quadg.levels); level++) {
-		pack[level]=pack_map((map_node *)bmaps[level], (int *)ext_map[_EL(level+1)], 
-				bmap_nodes[level], 0, &sz);
-		tmp_sz[level]=sz;
-		(*pack_sz)+=sz;
+	for (level = 0; level < BMAP_LEVELS(quadg.levels); level++) {
+		pack[level] =
+			pack_map((map_node *) bmaps[level],
+					 (int *) ext_map[_EL(level + 1)], bmap_nodes[level], 0,
+					 &sz);
+		tmp_sz[level] = sz;
+		(*pack_sz) += sz;
 	}
 
-	bmaps_hdr.levels=BMAP_LEVELS(quadg.levels);
-	bmaps_hdr.bmaps_block_sz=*pack_sz;
-	(*pack_sz)+=sizeof(struct bnode_maps_hdr);
-	
-	final_pack=xmalloc((*pack_sz));
+	bmaps_hdr.levels = BMAP_LEVELS(quadg.levels);
+	bmaps_hdr.bmaps_block_sz = *pack_sz;
+	(*pack_sz) += sizeof(struct bnode_maps_hdr);
+
+	final_pack = xmalloc((*pack_sz));
 	memcpy(final_pack, &bmaps_hdr, sizeof(struct bnode_maps_hdr));
 	ints_host_to_network(final_pack, bnode_maps_hdr_iinfo);
-	
-	buf=final_pack+sizeof(struct bnode_maps_hdr);
-	for(level=0; level < BMAP_LEVELS(quadg.levels); level++) {
+
+	buf = final_pack + sizeof(struct bnode_maps_hdr);
+	for (level = 0; level < BMAP_LEVELS(quadg.levels); level++) {
 		memcpy(buf, pack[level], tmp_sz[level]);
-		buf+=tmp_sz[level];
+		buf += tmp_sz[level];
 		xfree(pack[level]);
 	}
 
@@ -319,57 +343,60 @@ pack_all_bmaps(map_bnode **bmaps,  u_int *bmap_nodes, map_gnode **ext_map,
  * contain.
  * On error 0 is returned.
  * Note: `pack' will be modified during the unpacking.
- */ 
+ */
 map_bnode **
-unpack_all_bmaps(char *pack, u_char max_levels, map_gnode **ext_map, 
-		u_int **bmap_nodes, int maxbnodes, int maxbnode_rnodeblock)
+unpack_all_bmaps(char *pack, u_char max_levels, map_gnode ** ext_map,
+				 u_int ** bmap_nodes, int maxbnodes,
+				 int maxbnode_rnodeblock)
 {
 	struct bnode_maps_hdr *bmaps_hdr;
 	struct bnode_map_hdr *bmap_hdr;
 	map_bnode **bmap, *unpacked_bmap;
 	size_t bblock_sz, pack_sz;
-	int i,e=0;
+	int i, e = 0;
 	char *bblock, *buf;
 	u_char levels;
-	
-	bmaps_hdr=(struct bnode_maps_hdr *)pack;
+
+	bmaps_hdr = (struct bnode_maps_hdr *) pack;
 	ints_network_to_host(bmaps_hdr, bnode_maps_hdr_iinfo);
 
-	levels=bmaps_hdr->levels;
-	pack_sz=bmaps_hdr->bmaps_block_sz;
-	
-	if(levels > max_levels || pack_sz < sizeof(struct bnode_maps_hdr))
+	levels = bmaps_hdr->levels;
+	pack_sz = bmaps_hdr->bmaps_block_sz;
+
+	if (levels > max_levels || pack_sz < sizeof(struct bnode_maps_hdr))
 		return 0;
 
 	bmap_levels_init(levels, &bmap, bmap_nodes);
 
-	buf=pack+sizeof(struct bnode_maps_hdr);
-	for(i=0; i<levels; i++) {
-		bmap_hdr=(struct bnode_map_hdr *)buf;
-		if(!bmap_hdr->bnode_map_sz) {
-			buf+=sizeof(struct bnode_map_hdr);
+	buf = pack + sizeof(struct bnode_maps_hdr);
+	for (i = 0; i < levels; i++) {
+		bmap_hdr = (struct bnode_map_hdr *) buf;
+		if (!bmap_hdr->bnode_map_sz) {
+			buf += sizeof(struct bnode_map_hdr);
 			continue;
 		}
-		
-		/*Extracting the map...*/
-		bblock=(char *)bmap_hdr;
-		unpacked_bmap=unpack_map(bblock, (int *)ext_map[_EL(i+1)], 0,	
-				maxbnodes, maxbnode_rnodeblock);
-		if(!unpacked_bmap) {
-			error("Cannot unpack the bnode_map at level %d ! Skipping...", i);
+
+		/*Extracting the map... */
+		bblock = (char *) bmap_hdr;
+		unpacked_bmap = unpack_map(bblock, (int *) ext_map[_EL(i + 1)], 0,
+								   maxbnodes, maxbnode_rnodeblock);
+		if (!unpacked_bmap) {
+			error("Cannot unpack the bnode_map at level %d ! Skipping...",
+				  i);
 			e++;
 			continue;
 		}
 
-		(*bmap_nodes)[i]=bmap_hdr->bnode_map_sz/MAP_BNODE_PACK_SZ;
-		bblock_sz=INT_MAP_BLOCK_SZ(bmap_hdr->bnode_map_sz, bmap_hdr->rblock_sz);
+		(*bmap_nodes)[i] = bmap_hdr->bnode_map_sz / MAP_BNODE_PACK_SZ;
+		bblock_sz =
+			INT_MAP_BLOCK_SZ(bmap_hdr->bnode_map_sz, bmap_hdr->rblock_sz);
 
-		bmap[i]=unpacked_bmap;
+		bmap[i] = unpacked_bmap;
 
-		buf+=bblock_sz;
+		buf += bblock_sz;
 	}
-	
-	if(e == levels)
+
+	if (e == levels)
 		/* Not a single map was restored */
 		return 0;
 
@@ -383,20 +410,22 @@ unpack_all_bmaps(char *pack, u_char max_levels, map_gnode **ext_map,
  * `bmap_nodes[x]' nodes. `ext_map' is the pointer to the external map the bmap is
  * referring to.
  */
-int save_bmap(map_bnode **bmaps, u_int *bmap_nodes, map_gnode **ext_map, 
-		quadro_group quadg, char *file)
+int
+save_bmap(map_bnode ** bmaps, u_int * bmap_nodes, map_gnode ** ext_map,
+		  quadro_group quadg, char *file)
 {
 	FILE *fd;
 	char *pack;
 	size_t pack_sz;
-	
-	
-	pack=pack_all_bmaps(bmaps, bmap_nodes, ext_map, quadg, &pack_sz);
-	if(!pack_sz || !pack)
+
+
+	pack = pack_all_bmaps(bmaps, bmap_nodes, ext_map, quadg, &pack_sz);
+	if (!pack_sz || !pack)
 		return 0;
 
-	if((fd=fopen(file, "w"))==NULL) {
-		error("Cannot save the bnode_map in %s: %s", file, strerror(errno));
+	if ((fd = fopen(file, "w")) == NULL) {
+		error("Cannot save the bnode_map in %s: %s", file,
+			  strerror(errno));
 		return -1;
 	}
 	fwrite(pack, pack_sz, 1, fd);
@@ -412,43 +441,45 @@ int save_bmap(map_bnode **bmaps, u_int *bmap_nodes, map_gnode **ext_map,
  * the bmap shall refer to. In `bmap_nodes' the address of the u_int array, used
  * to count the nodes in each bmaps, is stored. On error 0 is returned.
  */
-map_bnode **load_bmap(char *file, map_gnode **ext_map, u_char max_levels, u_int **bmap_nodes)
+map_bnode **
+load_bmap(char *file, map_gnode ** ext_map, u_char max_levels,
+		  u_int ** bmap_nodes)
 {
-	map_bnode **bmap=0;
+	map_bnode **bmap = 0;
 	FILE *fd;
 	struct bnode_maps_hdr bmaps_hdr;
 	size_t pack_sz;
 	u_char levels;
-	char *pack=0;
-	
-	if((fd=fopen(file, "r"))==NULL) {
+	char *pack = 0;
+
+	if ((fd = fopen(file, "r")) == NULL) {
 		error("Cannot load the bmap from %s: %s", file, strerror(errno));
 		return 0;
 	}
-	
-	if(!fread(&bmaps_hdr, sizeof(struct bnode_maps_hdr), 1, fd))
+
+	if (!fread(&bmaps_hdr, sizeof(struct bnode_maps_hdr), 1, fd))
 		goto finish;
-		
+
 	ints_network_to_host(&bmaps_hdr, bnode_maps_hdr_iinfo);
-	levels=bmaps_hdr.levels;
-	pack_sz=bmaps_hdr.bmaps_block_sz;
-	if(levels > max_levels || pack_sz < sizeof(struct bnode_maps_hdr))
+	levels = bmaps_hdr.levels;
+	pack_sz = bmaps_hdr.bmaps_block_sz;
+	if (levels > max_levels || pack_sz < sizeof(struct bnode_maps_hdr))
 		goto finish;
 
 	/* Extracting the map... */
 	rewind(fd);
-	pack=xmalloc(pack_sz);
-	if(!fread(pack, pack_sz, 1, fd))
+	pack = xmalloc(pack_sz);
+	if (!fread(pack, pack_sz, 1, fd))
 		goto finish;
-	
-	bmap=unpack_all_bmaps(pack, max_levels, ext_map, bmap_nodes, 
-			MAXGROUPNODE, MAXBNODE_RNODEBLOCK);
-	
-finish:
+
+	bmap = unpack_all_bmaps(pack, max_levels, ext_map, bmap_nodes,
+							MAXGROUPNODE, MAXBNODE_RNODEBLOCK);
+
+  finish:
 	fclose(fd);
-	if(pack)
+	if (pack)
 		xfree(pack);
-	if(!bmap)
+	if (!bmap)
 		error("Malformed bmap file. Cannot load the bnode maps.");
 	return bmap;
 }

src/bmap.h

@@ -22,10 +22,10 @@
 #include "gmap.h"
 
 #define BMAP_UPDATE	MAP_UPDATE	/* At each new qspn_round all the bnodes flags are set 
-					   to BMAP_UPDATE, thus when tracer_store_pkt() updates
-					   them for the first time during the new round, it
-					   deletes their rnodes. */
-					   
+								   to BMAP_UPDATE, thus when tracer_store_pkt() updates
+								   them for the first time during the new round, it
+								   deletes their rnodes. */
+
 /* 
  * map_bnode is the struct used to create the "map border node". 
  * This map keeps all the border node of the map, making it easy to retrieve
@@ -51,17 +51,17 @@
 typedef map_node map_bnode;
 #define MAP_BNODE_PACK_SZ	MAP_NODE_PACK_SZ
 #define MAXGROUPBNODE		MAXGROUPNODE	/*the maximum number of bnodes in 
-						  a gnode is equal to the maximum 
-						  number of nodes*/
-#define MAXBNODE_LINKS		(MAXGROUPNODE*2)/*The maximum number of gnodes a
-						  bnode is linked to*/
+											   a gnode is equal to the maximum 
+											   number of nodes */
+#define MAXBNODE_LINKS		(MAXGROUPNODE*2)	/*The maximum number of gnodes a
+												   bnode is linked to */
 #define MAXBNODE_RNODEBLOCK	(MAXBNODE_LINKS*MAXGROUPBNODE*MAP_RNODE_PACK_SZ)
 
 /* 
  * These defines make the life easier, so instead of writing int_map_hdr I
  * write bnode_map_hdr. Cool eh? ^_^.
  */
-#define bnode_ptr		brdcast		/*Don't kill me*/
+#define bnode_ptr		brdcast	/*Don't kill me */
 #define bnode_map_hdr 		int_map_hdr
 #define bnode_map_sz   		int_map_sz
 
@@ -86,12 +86,11 @@ typedef map_node map_bnode;
  * The bblock is also used to store the Internet gateways, see igs.h for more
  * details.
  */
-typedef struct
-{
-	u_char  bnode_levels;
-	u_short links;			/*The number of linked gnode*/
-}_PACKED_ bnode_hdr;
-INT_INFO bnode_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { sizeof(char) }, { 1 } };
+typedef struct {
+	u_char bnode_levels;
+	u_short links;				/*The number of linked gnode */
+} _PACKED_ bnode_hdr;
+INT_INFO bnode_hdr_iinfo = { 1, {INT_TYPE_16BIT}, {sizeof(char)}, {1} };
 
 /*
  * This is part of the bnode_hdr.
@@ -101,18 +100,18 @@ INT_INFO bnode_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { sizeof(char) }, { 1 } };
 #define BNODE_HDR_SZ(levels)		(sizeof(bnode_hdr)+sizeof(u_char)*(levels))
 
 
-typedef struct
-{
+typedef struct {
 	/* The `bnode_hdr.bnode' borders on the `gnode' of `level'th level with
 	 * a round trip time which is stored in `rtt'. */
 
-	u_char		gnode;	     
-	u_char		level;
-	u_int		rtt;
-}_PACKED_ bnode_chunk;
+	u_char gnode;
+	u_char level;
+	u_int rtt;
+} _PACKED_ bnode_chunk;
 #define BNODEBLOCK_SZ(levels, links) (BNODE_HDR_SZ((levels)) +		       \
 					(sizeof(bnode_chunk)*(links)))
-INT_INFO bnode_chunk_iinfo = { 1, { INT_TYPE_32BIT }, { sizeof(char)*2 }, { 1 } };
+INT_INFO bnode_chunk_iinfo =
+	{ 1, {INT_TYPE_32BIT}, {sizeof(char) * 2}, {1} };
 
 
 /* 
@@ -131,39 +130,48 @@ INT_INFO bnode_chunk_iinfo = { 1, { INT_TYPE_32BIT }, { sizeof(char)*2 }, { 1 }
  * 	
  * 	...
  */
-struct bnode_maps_hdr
-{
+struct bnode_maps_hdr {
 	u_char levels;
 	size_t bmaps_block_sz;
-}_PACKED_;
-INT_INFO bnode_maps_hdr_iinfo = { 1, { INT_TYPE_32BIT }, { sizeof(char) }, { 1 } };
+} _PACKED_;
+INT_INFO bnode_maps_hdr_iinfo =
+	{ 1, {INT_TYPE_32BIT}, {sizeof(char)}, {1} };
 
 /* * * Functions' declaration * * */
-void bmap_levels_init(u_char levels, map_bnode ***bmap, u_int **bmap_nodes);
-void bmap_levels_free(map_bnode **bmap, u_int *bmap_nodes);
-void bmap_counter_init(u_char levels, u_int **bnodes_closed, u_int **bnodes_opened);
-void bmap_counter_free(u_int *bnodes_closed, u_int *bnodes_opened);
-void bmap_counter_reset(u_char levels, u_int *counter);
-
-int map_add_bnode(map_bnode **bmap, u_int *bmap_nodes, u_int bnode, u_int links);
-map_bnode *map_bnode_del(map_bnode *bmap, u_int *bmap_nodes,  map_bnode *bnode);
+void bmap_levels_init(u_char levels, map_bnode *** bmap,
+					  u_int ** bmap_nodes);
+void bmap_levels_free(map_bnode ** bmap, u_int * bmap_nodes);
+void bmap_counter_init(u_char levels, u_int ** bnodes_closed,
+					   u_int ** bnodes_opened);
+void bmap_counter_free(u_int * bnodes_closed, u_int * bnodes_opened);
+void bmap_counter_reset(u_char levels, u_int * counter);
+
+int map_add_bnode(map_bnode ** bmap, u_int * bmap_nodes, u_int bnode,
+				  u_int links);
+map_bnode *map_bnode_del(map_bnode * bmap, u_int * bmap_nodes,
+						 map_bnode * bnode);
 int bmap_del_rnode_by_level(map_bnode *, int, map_gnode **, int);
-int map_find_bnode(map_bnode *bmap, int bmap_nodes, int node);
-int map_find_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n);
+int map_find_bnode(map_bnode * bmap, int bmap_nodes, int node);
+int map_find_bnode_rnode(map_bnode * bmap, int bmap_nodes, void *n);
 
-int map_count_bnode_rnode(map_bnode *bmap, int bmap_nodes, void *n);
-int bmaps_count_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void *n);
-int map_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, void *n);
-int bmaps_del_bnode_rnode(map_bnode **bmap, int *bmap_nodes, int levels, void *n);
+int map_count_bnode_rnode(map_bnode * bmap, int bmap_nodes, void *n);
+int bmaps_count_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, int levels,
+							void *n);
+int map_del_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, void *n);
+int bmaps_del_bnode_rnode(map_bnode ** bmap, int *bmap_nodes, int levels,
+						  void *n);
 
-void map_set_bnode_flag(map_bnode *bmap, int bmap_nodes, int flags);
-void bmaps_set_bnode_flag(map_bnode **bmap, int *bmap_nodes, int levels, int flags);
+void map_set_bnode_flag(map_bnode * bmap, int bmap_nodes, int flags);
+void bmaps_set_bnode_flag(map_bnode ** bmap, int *bmap_nodes, int levels,
+						  int flags);
 
-char *pack_all_bmaps(map_bnode **, u_int *, map_gnode **, quadro_group, size_t *);
-map_bnode **unpack_all_bmaps(char *, u_char, map_gnode **, u_int **, int, int);
+char *pack_all_bmaps(map_bnode **, u_int *, map_gnode **, quadro_group,
+					 size_t *);
+map_bnode **unpack_all_bmaps(char *, u_char, map_gnode **, u_int **, int,
+							 int);
 
 int save_bmap(map_bnode **, u_int *, map_gnode **, quadro_group, char *);
 map_bnode **load_bmap(char *, map_gnode **, u_char, u_int **);
 
 
-#endif /*BMAP_H*/
+#endif							/*BMAP_H */

src/buffer.c

@@ -25,12 +25,13 @@
  * Is the buffer `a' filled with `sz'# of zeros?
  * If yes return 1. 
  */
-int is_bufzero(const void *a, int sz)
+int
+is_bufzero(const void *a, int sz)
 {
-	const char *p=a;
+	const char *p = a;
 	int i;
-	for(i=0; i<sz; i++, p++)
-		if(*p)
+	for (i = 0; i < sz; i++, p++)
+		if (*p)
 			return 0;
 	return 1;
 }

src/buffer.h

@@ -73,4 +73,4 @@
 \*/
 int is_bufzero(const void *a, int sz);
 
-#endif /*BUFFER_H*/
+#endif							/*BUFFER_H */

src/common.h

@@ -1,3 +1,21 @@
+/* This file is part of Netsukuku
+ *
+ * This source code is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This source code is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Please refer to the GNU Public License for more details.
+ *
+ * You should have received a copy of the GNU Public License along with
+ * this source code; if not, write to:
+ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
 #ifndef COMMON_H
 #define COMMON_H
 

src/conf.c

@@ -32,12 +32,13 @@
  *
  * do not make the environment dirty
  */
-void clear_config_env(void)
+void
+clear_config_env(void)
 {
 	int i;
 
-	for(i=0; config_str[i][0]; i++)
-		if(getenv(config_str[i]))
+	for (i = 0; config_str[i][0]; i++)
+		if (getenv(config_str[i]))
 			unsetenv(config_str[i]);
 }
 
@@ -48,31 +49,32 @@ void clear_config_env(void)
  * On failure fatal() is called, so it will never return ;)
  * `file' and `pos' are used by fatal() to tell where the corrupted `line' was.
  */
-void parse_config_line(char *file, int pos, char *line)
+void
+parse_config_line(char *file, int pos, char *line)
 {
-	int i, e=0;
+	int i, e = 0;
 	char *value;
-	
-	if(!(value=strchr(line, '=')))
+
+	if (!(value = strchr(line, '=')))
 		fatal("The line %s:%d is invalid, it does not contain the '=' "
-				"character. Aborting.", file, pos);
+			  "character. Aborting.", file, pos);
 
-	for(i=0; config_str[i][0]; i++)
-		if(strstr(line, config_str[i])) {
-			e=1;
+	for (i = 0; config_str[i][0]; i++)
+		if (strstr(line, config_str[i])) {
+			e = 1;
 			break;
 		}
-	if(!e)
- 	    fatal("The line %s:%d does not contain a valid option. Aborting.",
-				file, pos);
+	if (!e)
+		fatal("The line %s:%d does not contain a valid option. Aborting.",
+			  file, pos);
 
 	value++;
-	while(isspace(*value)) 
+	while (isspace(*value))
 		value++;
-	
-	if(setenv(config_str[i], value, 1))
-		fatal("Error in line %s:%d: %s. Aborting.", file, pos, 
-				strerror(errno));
+
+	if (setenv(config_str[i], value, 1))
+		fatal("Error in line %s:%d: %s. Aborting.", file, pos,
+			  strerror(errno));
 }
 
 
@@ -83,47 +85,48 @@ void parse_config_line(char *file, int pos, char *line)
  * parse_config_line() detects a corrupted line, fatal() is directly called.
  * On success 0 is returned.
  */
-int load_config_file(char *file)
+int
+load_config_file(char *file)
 {
 	FILE *fd;
-	char buf[PATH_MAX+1], *p, *str;
+	char buf[PATH_MAX + 1], *p, *str;
 	size_t slen;
-	int i=0, e=0;
+	int i = 0, e = 0;
 
-	if(!(fd=fopen(file, "r"))) {
+	if (!(fd = fopen(file, "r"))) {
 		fatal("Cannot load the configuration file from %s: %s\n"
-			"  Maybe you want to use the -c option ?",
-			file, strerror(errno));
+			  "  Maybe you want to use the -c option ?",
+			  file, strerror(errno));
 		return -1;
 	}
 
-	while(!feof(fd) && i < CONF_MAX_LINES) {
-		setzero(buf, PATH_MAX+1);
+	while (!feof(fd) && i < CONF_MAX_LINES) {
+		setzero(buf, PATH_MAX + 1);
 		fgets(buf, PATH_MAX, fd);
 		e++;
 
-		if(feof(fd))
+		if (feof(fd))
 			break;
 
-		str=buf;
-		while(isspace(*str))
+		str = buf;
+		while (isspace(*str))
 			str++;
-		if(*str=='#' || !*str) {
+		if (*str == '#' || !*str) {
 			/* Strip off any comment or null lines */
 			continue;
 		} else {
 			/* Remove the last part of the string where a side
-			 * comment starts, 	#a comment like this.
+			 * comment starts,  #a comment like this.
 			 */
-			if((p=strrchr(str, '#')))
-				*p='\0';
-			
+			if ((p = strrchr(str, '#')))
+				*p = '\0';
+
 			/* Don't include the newline and spaces of the end of 
 			 * the string */
-			slen=strlen(str);
-			for(p=&str[slen-1]; isspace(*p); p--)
-				*p='\0';
-			
+			slen = strlen(str);
+			for (p = &str[slen - 1]; isspace(*p); p--)
+				*p = '\0';
+
 
 			parse_config_line(file, e, str);
 			i++;

src/conf.h

@@ -41,8 +41,7 @@
 /* 
  * The allowed options in the configuration file
  */
-enum config_options
-{
+enum config_options {
 	CONF_NTK_INT_MAP_FILE,
 	CONF_NTK_BNODE_MAP_FILE,
 	CONF_NTK_EXT_MAP_FILE,
@@ -62,7 +61,7 @@ enum config_options
 
 	CONF_DISABLE_ANDNA,
 	CONF_DISABLE_RESOLVCONF,
-	
+
 	CONF_NTK_RESTRICTED_MODE,
 	CONF_NTK_RESTRICTED_CLASS,
 	CONF_NTK_INTERNET_CONNECTION,
@@ -77,44 +76,43 @@ enum config_options
 	CONF_NTK_TC_SHAPER_SCRIPT,
 };
 
-const static char config_str[][30]=
-{
-	{ "ntk_int_map_file" },
-	{ "ntk_bnode_map_file" },
-	{ "ntk_ext_map_file" },
-	
-	{ "andna_hnames_file" },
-	{ "snsd_nodes_file" },
-	{ "andna_cache_file" },
-	{ "andna_lclkey_file" },
-	{ "andna_lcl_file" },
-	{ "andna_rhc_file" },
-	{ "andna_counter_c_file" },
-
-	{ "pid_file" },
-	{ "ntk_max_connections" },
-	{ "ntk_max_accepts_per_host" },
-	{ "max_accepts_per_host_time" },
-
-	{ "disable_andna" },
-	{ "disable_resolvconf" },
-	{ "ntk_restricted_mode" },
-	{ "ntk_restricted_class" },
-	{ "internet_connection" },
-	{ "internet_gateway" },
-	{ "internet_upload_rate" },
-	{ "internet_download_rate" },
-	{ "internet_ping_hosts" },
-	{ "share_internet" },
-	{ "shape_internet" },
-	{ "use_shared_internet" },
-	{ "ip_masquerade_script" },
-	{ "tc_shaper_script" },
-	{ 0 },
+const static char config_str[][30] = {
+	{"ntk_int_map_file"},
+	{"ntk_bnode_map_file"},
+	{"ntk_ext_map_file"},
+
+	{"andna_hnames_file"},
+	{"snsd_nodes_file"},
+	{"andna_cache_file"},
+	{"andna_lclkey_file"},
+	{"andna_lcl_file"},
+	{"andna_rhc_file"},
+	{"andna_counter_c_file"},
+
+	{"pid_file"},
+	{"ntk_max_connections"},
+	{"ntk_max_accepts_per_host"},
+	{"max_accepts_per_host_time"},
+
+	{"disable_andna"},
+	{"disable_resolvconf"},
+	{"ntk_restricted_mode"},
+	{"ntk_restricted_class"},
+	{"internet_connection"},
+	{"internet_gateway"},
+	{"internet_upload_rate"},
+	{"internet_download_rate"},
+	{"internet_ping_hosts"},
+	{"share_internet"},
+	{"shape_internet"},
+	{"use_shared_internet"},
+	{"ip_masquerade_script"},
+	{"tc_shaper_script"},
+	{0},
 };
 
 
 void clear_config_env(void);
 int load_config_file(char *file);
 
-#endif /*CONF_H*/
+#endif							/*CONF_H */

src/conf/Makefile.am

@@ -1 +0,0 @@
-sysconf_DATA = netsukuku.conf andna_hostnames snsd_nodes

src/conf/Makefile.in

@@ -1,464 +0,0 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/conf
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(srcdir)/netsukuku.conf.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES = netsukuku.conf
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-am__installdirs = "$(DESTDIR)$(sysconfdir)"
-DATA = $(sysconf_DATA)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_DIR = @CONF_DIR@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_DIR = @DATA_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-IF_METHOD = @IF_METHOD@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-OTHER_METHOD = @OTHER_METHOD@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PID_DIR = @PID_DIR@
-RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-debug_flags = @debug_flags@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gmp = @gmp@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-sysconf_DATA = netsukuku.conf andna_hostnames snsd_nodes
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/conf/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/conf/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-netsukuku.conf: $(top_builddir)/config.status $(srcdir)/netsukuku.conf.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-install-sysconfDATA: $(sysconf_DATA)
-	@$(NORMAL_INSTALL)
-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-	if test -n "$$list"; then \
-	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
-	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
-	fi; \
-	for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; \
-	done | $(am__base_list) | \
-	while read files; do \
-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
-	done
-
-uninstall-sysconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sysconf_DATA)'; test -n "$(sysconfdir)" || list=; \
-	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	dir='$(DESTDIR)$(sysconfdir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(DATA)
-installdirs:
-	for dir in "$(DESTDIR)$(sysconfdir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am: install-sysconfDATA
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man:
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-sysconfDATA
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip install-sysconfDATA \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am tags-am uninstall uninstall-am \
-	uninstall-sysconfDATA
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

src/conf/netsukuku.conf.in

@@ -1,199 +0,0 @@
-#
-#			NetsukukuD @VERSION@
-#
-#
-# The comments starts with a '#'.
-# To use a default option leave its line commented.
-# Use always the '=' to assign a value.
-#
-# Note: the options will be overridden by their command line equivalent.
-#
-# Options index:
-# 
-# 	## Restricted mode
-#		- ntk_restricted_mode
-#		- ntk_restricted_class
-#	## Internet connection
-#		- internet_connection
-#		- internet_gateway
-#		- internet_download_rate
-#		- internet_upload_rate
-#		- internet_ping_hosts
-#		- share_internet
-#		- shape_internet
-#		- use_shared_internet
-#	## ANDNA
-#		- disable_andna
-#		- disable_resolvconf
-#	## Limits
-#		- ntk_max_connections
-#		- ntk_max_accepts_per_host
-#		- max_accepts_per_host_time
-#	## Files
-#		- pid_file
-#		- ntk_ext_map_file
-#		- ntk_int_map_file
-#		- ntk_bnode_map_file
-#		- andna_hnames_file
-#		- snsd_nodes_file
-#		- andna_cache_file
-#		- andna_lclkey_file
-#		- andna_lcl_file
-#		- andna_rhc_file
-#		- andna_counter_c_file
-#		- ip_masquerade_script
-#		- tc_shaper_script
-#
-
-
-##
-#### Restricted mode
-##
-
-#
-# If the `ntk_restricted_mode' option is set to 1, NetsukukuD will be started
-# in restricted mode to be compatible with Internet. In the restricted mode, 
-# only IPs of the largest private subnet (i.e. 10.x.x.x) are chosen.
-#
-# If `ntk_restricted_class' is set to 1 the IPs will be chosen from the
-# 172.16.0.0-172.31.255.255 range (use this option only if you can't use the 
-# 10.x.x.x class).
-#
-#ntk_restricted_mode	= 0
-#ntk_restricted_class	= 0
-
-
-##
-#### Internet connection
-##
-
-#
-# * * If you have an Internet connection please fill this options. * *
-#
-# We are assuming that you are running in restricted mode since you want to
-# be both in Netsukuku and Internet. So, if you have an internet connection
-# set `internet_connection' to 1. Note that ntkd will overwrite any default
-# route if this option is set to 0 and the shared Internet connections of 
-# other nodes are used.
-#
-# Set the `internet_gateway' option to the IP of the gateway you use to reach 
-# the Internet and specify the network interface too, for example:
-# "internet_gateway = 192.168.1.1:eth0". This option is necessary only if you
-# don't have the default route set when you run NetsukukuD (i.e. you haven't
-# connected yet), otherwise, leave it commented.
-#
-# You have also to set your upload and download bandwidth in 
-# `internet_upload_rate' and `internet_download_rate'. It is expressed in Kb/s,
-# so if you have a line which maximum can do: 640 Kb/s in dwload and 30 Kb/s in 
-# upload, set them to 640 and 30.
-#
-# `internet_ping_hosts' is a list of Internet hosts which will be pinged to
-# verify if the connection is alive, you can use the default hosts.
-#
-# If you want to share your Internet connection among other Netsukuku nodes, 
-# set `share_internet' to 1.
-#
-# Set `shape_internet' to 1 if you want to shape your outgoing
-# Internet traffic.
-#
-# `use_shared_internet' specifies if you want to use the Internet connections
-# shared by the Netsukuku nodes. Set it to 0, if you want to rely only on your
-# connection (if any).
-# 
-#internet_connection	= 1
-#internet_gateway	= 192.168.1.1:eth0
-internet_download_rate  = 640
-internet_upload_rate	= 30
-internet_ping_hosts	= google.com:cisco.com:sourceforge.net:dyne.org
-#share_internet		= 1
-#shape_internet		= 1
-#use_shared_internet	= 1
-
-
-##
-#### ANDNA
-##
-
-#
-# To disable the start of the ANDNA daemon at the launch of ntkd, set
-# this option to 1. Note that when the ANDNA daemon is disabled, the andna
-# system will not work at all, so it will be impossible to resolve, register
-# or update hostnames.
-#
-#disable_andna		= 0
-
-#
-# When NetsukukuD starts it modifies /etc/resolv.conf writing in the first
-# line "nameserver 127.0.0.1". The old /etc/resolv.conf is copied in
-# /etc/resolv.conf.bak. When the daemon is closed /etc/resolv.conf is
-# restored. If you want to disable this set disable_resolvconf to 1.
-# If it is disabled you won't be able to resolve hostnames!
-#
-#disable_resolvconf	= 0
-
-
-##
-#### Limits
-##
-
-#
-# How many connection the netsukuku daemons can simultaneusly handle.
-#
-#ntk_max_connections		= 512
-
-# How many simultaneusly connections to the daemons from a single host are
-# allowed.
-#ntk_max_accepts_per_host	= 16
-
-# The wait time necessary for a host to reconnect to the daemons after all the
-# ntk_max_accepts_per_host were used.
-#
-#max_accepts_per_host_time	= 4	#in seconds
-
-
-##
-#### Files
-##
-
-#
-# ntkd will save its process id in this file
-#
-#pid_file 		= @PID_DIR@/ntkd.pid
-
-# 
-# The paths of the Netsukuku maps saved by the daemon
-#
-#ntk_ext_map_file	= @DT_DIR@/ext_map_file
-#ntk_int_map_file	= @DT_DIR@/int_map_file
-#ntk_bnode_map_file	= @DT_DIR@/bnode_map_file
-
-#
-# The hostnames that will be registered in ANDNA are kept, one per line, in
-# this file.
-#
-#andna_hnames_file	= @CONF_DIR@/andna_hostnames
-
-#
-# The snsd_nodes_file keeps the list of the SNSD records which will be
-# register in ANDNA.
-#
-#snsd_nodes_file	= @CONF_DIR@/snsd_nodes
-
-#
-# Caches used by the ANDNA daemon
-#
-#andna_cache_file	= @DT_DIR@/andna_cache
-#andna_lclkey_file	= @DT_DIR@/andna_lcl_keyring
-#andna_lcl_file		= @DT_DIR@/andna_lcl_cache
-#andna_rhc_file		= @DT_DIR@/andna_rh_cache
-#andna_counter_c_file	= @DT_DIR@/andna_counter_cache
-
-#
-# The script launched by NetsukukuD to share the Internet connection
-#
-#ip_masquerade_script	= @CONF_DIR@/ip_masquerade.sh
-
-#
-# The script launched by NetsukukuD to shape the Internet connection
-#
-#tc_shaper_script	= @CONF_DIR@/tc_shaper.sh

src/config.h.in

@@ -1,109 +0,0 @@
-/* src/config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* "Location of configuration files" */
-#undef CONF_DIR
-
-/* "Where the Netsukuku data is saved" */
-#undef DATA_DIR
-
-/* FreeBSD */
-#undef FREEBSD
-
-/* GNU Linux */
-#undef GNU_LINUX
-
-/* Define to 1 if you have the <gmp.h> header file. */
-#undef HAVE_GMP_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `kvm' library (-lkvm). */
-#undef HAVE_LIBKVM
-
-/* Define to 1 if you have the `nsl' library (-lnsl). */
-#undef HAVE_LIBNSL
-
-/* Define to 1 if you have the `socket' library (-lsocket). */
-#undef HAVE_LIBSOCKET
-
-/* Define to 1 if you have the `xnet' library (-lxnet). */
-#undef HAVE_LIBXNET
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* netlink */
-#undef HAVE_NETLINK
-
-/* NET_RT_IFLIST */
-#undef HAVE_NET_RT_IFLIST
-
-/* Define to 1 if you have the <openssl/crypto.h> header file. */
-#undef HAVE_OPENSSL_CRYPTO_H
-
-/* Define to 1 if you have the <pthread.h> header file. */
-#undef HAVE_PTHREAD_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
-
-/* IRIX 6.5 */
-#undef IRIX
-
-/* OpenBSD */
-#undef OPEN_BSD
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* ntkd.pid file location */
-#undef PID_DIR
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* SunOS 5 */
-#undef SUNOS
-
-/* Version number of package */
-#undef VERSION

src/console.h

@@ -0,0 +1,60 @@
+/* This file is part of Netsukuku
+ *
+ * This source code is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This source code is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Please refer to the GNU Public License for more details.
+ *
+ * You should have received a copy of the GNU Public License along with
+ * this source code; if not, write to:
+ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+#ifndef CONSOLE_H
+#define CONSOLE_H
+
+
+#define CONSOLE_SOCKET_PATH 	"/tmp/ntk-console"
+#define CONSOLE_VERSION_MAJOR	0
+#define CONSOLE_VERSION_MINOR 	3
+#define CONSOLE_ARGV_LENGTH 	250
+#define CONSOLE_BUFFER_LENGTH 	250
+
+#ifndef TRUE
+#define FALSE               0
+#define TRUE                1
+#endif
+
+
+typedef enum {
+	COMMAND_HELP = 0x100,
+	COMMAND_UPTIME,
+	COMMAND_KILL,
+	COMMAND_VERSION,
+	COMMAND_INETCONN,
+	COMMAND_CURIFS,
+	COMMAND_CURIFSCT,
+	COMMAND_CURQSPNID,
+	COMMAND_CURIP,
+	COMMAND_CURNODE,
+	COMMAND_IFS,
+	COMMAND_IFSCT,
+	COMMAND_QUIT,
+	COMMAND_CONSUPTIME,
+} command_t;
+
+
+#pragma pack(1)
+typedef struct {
+	command_t command;
+	char *argv[CONSOLE_ARGV_LENGTH];
+} cmd_packet_t;
+#pragma pack(0)
+
+
+#endif							/* CONSOLE_H */

src/crypto.c

@@ -35,18 +35,21 @@
 #include "log.h"
 #include "xmalloc.h"
 
-void init_crypto(void)
+void
+init_crypto(void)
 {
 	RAND_load_file("/dev/urandom", 1024);
 	ERR_load_crypto_strings();
 }
 
-void free_crypto(void)
+void
+free_crypto(void)
 {
 	ERR_free_strings();
 }
 
-char *ssl_strerr(void)
+char *
+ssl_strerr(void)
 {
 	return ERR_error_string(ERR_get_error(), 0);
 }
@@ -58,43 +61,47 @@ char *ssl_strerr(void)
  * `priv' and `priv_len'.
  * On error null is returned.
  */
-RSA *genrsa(int key_bits, u_char **pub, u_int *pub_len, u_char **priv, u_int *priv_len)
+RSA *
+genrsa(int key_bits, u_char ** pub, u_int * pub_len, u_char ** priv,
+	   u_int * priv_len)
 {
-	RSA *rsa=0;
+	RSA *rsa = 0;
 	int len;
-	
-	rsa=RSA_generate_key(key_bits, RSA_F4, NULL, NULL);
+
+	rsa = RSA_generate_key(key_bits, RSA_F4, NULL, NULL);
 	if (!rsa) {
-		debug(DBG_SOFT, "RSA key generation failed"); 
+		debug(DBG_SOFT, "RSA key generation failed");
 		goto error;
 	}
 
-	if(priv) {
-		*priv=0;
-		len=i2d_RSAPrivateKey(rsa, priv);
-		if(priv_len)
-			*priv_len=len;
-		if(len <= 0) {
-			debug(DBG_SOFT, "Cannot dump RSA public key: %s", ssl_strerr());
+	if (priv) {
+		*priv = 0;
+		len = i2d_RSAPrivateKey(rsa, priv);
+		if (priv_len)
+			*priv_len = len;
+		if (len <= 0) {
+			debug(DBG_SOFT, "Cannot dump RSA public key: %s",
+				  ssl_strerr());
 			goto error;
 		}
 	}
 
-	if(pub) {
-		*pub=0;
-		len=i2d_RSAPublicKey(rsa, pub);
-		if(pub_len)
-			*pub_len=len;
-		if(len <= 0) {
-			debug(DBG_SOFT, "Cannot dump RSA public key: %s", ssl_strerr());
+	if (pub) {
+		*pub = 0;
+		len = i2d_RSAPublicKey(rsa, pub);
+		if (pub_len)
+			*pub_len = len;
+		if (len <= 0) {
+			debug(DBG_SOFT, "Cannot dump RSA public key: %s",
+				  ssl_strerr());
 			goto error;
 		}
 	}
-	
+
 	return rsa;
-error:
-	if(rsa)
-		RSA_free(rsa);	
+  error:
+	if (rsa)
+		RSA_free(rsa);
 	return 0;
 }
 
@@ -104,9 +111,10 @@ error:
  * Converts a dump of a rsa pub key to a RSA structure, which is returned.
  * Remeber to RSA_free() the returned key.
  */
-RSA *get_rsa_pub(const u_char **pub_key, long length)
+RSA *
+get_rsa_pub(const u_char ** pub_key, long length)
 {
-	 return d2i_RSAPublicKey(NULL, pub_key, length);
+	return d2i_RSAPublicKey(NULL, pub_key, length);
 }
 
 /*
@@ -115,17 +123,20 @@ RSA *get_rsa_pub(const u_char **pub_key, long length)
  * Converts a dump of a rsa priv key to a RSA structure, which is returned.
  * Remeber to RSA_free() the returned key.
  */
-RSA *get_rsa_priv(const u_char **priv_key, long length)
+RSA *
+get_rsa_priv(const u_char ** priv_key, long length)
 {
-	 return d2i_RSAPrivateKey(NULL, priv_key, length);
+	return d2i_RSAPrivateKey(NULL, priv_key, length);
 }
 
-u_char *hash_sha1(u_char *msg, u_int m_len, u_char *hash)
+u_char *
+hash_sha1(u_char * msg, u_int m_len, u_char * hash)
 {
 	return SHA1(msg, m_len, hash);
 }
 
-u_char *hash_md5(u_char *msg, u_int m_len, u_char *hash)
+u_char *
+hash_md5(u_char * msg, u_int m_len, u_char * hash)
 {
 	return MD5(msg, m_len, hash);
 }
@@ -135,20 +146,21 @@ u_char *hash_md5(u_char *msg, u_int m_len, u_char *hash)
  * signature. In `siglen' it stores the signature's lenght.
  * On error null is returned.
  */
-u_char *rsa_sign(u_char *msg, u_int m_len, RSA *priv, u_int *siglen)
+u_char *
+rsa_sign(u_char * msg, u_int m_len, RSA * priv, u_int * siglen)
 {
 	u_char *signature;
 	int ret, len;
 
-	ret=RSA_size(priv);
-	if(!ret)
+	ret = RSA_size(priv);
+	if (!ret)
 		return 0;
 
-	signature=(u_char *)xmalloc(ret);
-	ret=RSA_sign(NID_sha1, hash_sha1(msg, m_len, 0), SHA_DIGEST_LENGTH,
-			signature,(u_int*) &len, priv);
-	if(siglen)
-		*siglen=len;
+	signature = (u_char *) xmalloc(ret);
+	ret = RSA_sign(NID_sha1, hash_sha1(msg, m_len, 0), SHA_DIGEST_LENGTH,
+				   signature, (u_int *) & len, priv);
+	if (siglen)
+		*siglen = len;
 
 	return !ret ? 0 : signature;
 }
@@ -157,8 +169,10 @@ u_char *rsa_sign(u_char *msg, u_int m_len, RSA *priv, u_int *siglen)
  * verify_sign: verifies the rsa `signature' of `msg'.
  * It returns 1 if the signature is valid, otherwise 0 is returned.
  */
-int verify_sign(u_char *msg, u_int m_len, u_char *signature, u_int siglen, RSA *pub)
+int
+verify_sign(u_char * msg, u_int m_len, u_char * signature, u_int siglen,
+			RSA * pub)
 {
-        return RSA_verify(NID_sha1, hash_sha1(msg, m_len, 0), SHA_DIGEST_LENGTH,
-			signature, siglen, pub);
+	return RSA_verify(NID_sha1, hash_sha1(msg, m_len, 0),
+					  SHA_DIGEST_LENGTH, signature, siglen, pub);
 }

src/crypto.h

@@ -35,12 +35,14 @@
 void init_crypto(void);
 void free_crypto(void);
 char *ssl_strerr(void);
-RSA *genrsa(int key_bits, u_char **pub, u_int *pub_len, u_char **priv, u_int *priv_len);
-RSA *get_rsa_pub(const u_char **pub_key, long length);
-RSA *get_rsa_priv(const u_char **priv_key, long length);
-u_char *hash_sha1(u_char *msg, u_int len, u_char *hash);
-u_char *hash_md5(u_char *msg, u_int m_len, u_char *hash);
-u_char *rsa_sign(u_char *msg, u_int m_len, RSA *priv, u_int *siglen);
-int verify_sign(u_char *msg, u_int m_len, u_char *signature, u_int siglen, RSA *pub);
+RSA *genrsa(int key_bits, u_char ** pub, u_int * pub_len, u_char ** priv,
+			u_int * priv_len);
+RSA *get_rsa_pub(const u_char ** pub_key, long length);
+RSA *get_rsa_priv(const u_char ** priv_key, long length);
+u_char *hash_sha1(u_char * msg, u_int len, u_char * hash);
+u_char *hash_md5(u_char * msg, u_int m_len, u_char * hash);
+u_char *rsa_sign(u_char * msg, u_int m_len, RSA * priv, u_int * siglen);
+int verify_sign(u_char * msg, u_int m_len, u_char * signature,
+				u_int siglen, RSA * pub);
 
-#endif /*CRYPTO_H*/
+#endif							/*CRYPTO_H */

src/daemon.c

@@ -40,21 +40,22 @@ extern int errno;
  * `dev'->dev_name with the SO_BINDTODEVICE socket option.
  * The created socket is returned.
  */
-int prepare_listen_socket(int family, int socktype, u_short port, 
-		interface *dev)
+int
+prepare_listen_socket(int family, int socktype, u_short port,
+					  interface * dev)
 {
 	struct addrinfo hints, *ai, *aitop;
 	char strport[NI_MAXSERV];
 	int err, s;
 
 	setzero(&hints, sizeof(struct addrinfo));
-	hints.ai_family=family;
-	hints.ai_socktype=socktype;
-	hints.ai_flags=AI_PASSIVE;
+	hints.ai_family = family;
+	hints.ai_socktype = socktype;
+	hints.ai_flags = AI_PASSIVE;
 	snprintf(strport, NI_MAXSERV, "%u", port);
-	
-	err=getaddrinfo(NULL, strport, &hints, &aitop);
-	if(err) {
+
+	err = getaddrinfo(NULL, strport, &hints, &aitop);
+	if (err) {
 		error("Getaddrinfo error: %s", gai_strerror(err));
 		return -1;
 	}
@@ -62,35 +63,36 @@ int prepare_listen_socket(int family, int socktype, u_short port,
 	for (ai = aitop; ai; ai = ai->ai_next) {
 		if (ai->ai_family != AF_INET && ai->ai_family != AF_INET6)
 			continue;
-		
+
 		s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
 		if (s == -1)
-			/* Maybe we can use another socket...*/
+			/* Maybe we can use another socket... */
 			continue;
 
 		/* Bind the created socket to the device named dev->dev_name */
-		if(dev && (set_bindtodevice_sk(s, dev->dev_name) < 0)) {
+		if (dev && (set_bindtodevice_sk(s, dev->dev_name) < 0)) {
 			inet_close(&s);
 			continue;
 		}
 
-		if(set_reuseaddr_sk(s) < 0) {
+		if (set_reuseaddr_sk(s) < 0) {
 			inet_close(&s);
 			continue;
 		}
 
 		/* Let's bind it! */
-		if(bind(s, ai->ai_addr, ai->ai_addrlen) < 0) {
+		if (bind(s, ai->ai_addr, ai->ai_addrlen) < 0) {
 			error("Cannot bind the port %d: %s. Trying another "
-					"socket...", port, strerror(errno));
+				  "socket...", port, strerror(errno));
 			inet_close(&s);
 			continue;
 		}
 		freeaddrinfo(aitop);
 		return s;
 	}
-	
-	error("Cannot open inbound socket on port %d: %s", port, strerror(errno));
+
+	error("Cannot open inbound socket on port %d: %s", port,
+		  strerror(errno));
 	freeaddrinfo(aitop);
 	return -1;
 }
@@ -111,33 +113,32 @@ int prepare_listen_socket(int family, int socktype, u_short port,
  * returned.
  * If the error is fatal, a negative value is returned.
  */
-int sockets_all_ifs(int family, int socktype, u_short port, 
-			interface *ifs, int ifs_n, 
-			int *dev_sk, int *max_sk_idx)
+int
+sockets_all_ifs(int family, int socktype, u_short port,
+				interface * ifs, int ifs_n, int *dev_sk, int *max_sk_idx)
 {
-	int i, n, e=0;
+	int i, n, e = 0;
+
+	*max_sk_idx = 0;
 
-	*max_sk_idx=0;
+	for (i = 0, n = 0; i < ifs_n; i++) {
+		dev_sk[i] = prepare_listen_socket(family, socktype, port, &ifs[i]);
 
-	for(i=0, n=0; i<ifs_n; i++) {
-		dev_sk[i] = prepare_listen_socket(family, socktype, port,
-				&ifs[i]);
-		
-		if(dev_sk[i] < 0) {
+		if (dev_sk[i] < 0) {
 			error("Cannot create a socket on the %s interface! "
-					"Ignoring it", ifs[i].dev_name);
-			dev_sk[i]=0;
+				  "Ignoring it", ifs[i].dev_name);
+			dev_sk[i] = 0;
 			e++;
 			continue;
 		}
 
-		if(dev_sk[i] >= dev_sk[*max_sk_idx])
-			*max_sk_idx=i;
-		
+		if (dev_sk[i] >= dev_sk[*max_sk_idx])
+			*max_sk_idx = i;
+
 		n++;
 	}
 
-	if(e == ifs_n)
+	if (e == ifs_n)
 		return -1;
 
 	return n;
@@ -147,35 +148,36 @@ int sockets_all_ifs(int family, int socktype, u_short port,
  *  udp_exec_pkt: passes the received udp packet to pkt_exec().
  * `passed_argv' is a pointer to a udp_exec_pkt_argv struct 
  */
-void *udp_exec_pkt(void *passed_argv)
+void *
+udp_exec_pkt(void *passed_argv)
 {
 	struct udp_exec_pkt_argv argv;
-	
+
 	PACKET rpkt;
 	const char *ntop;
 
 	memcpy(&argv, passed_argv, sizeof(struct udp_exec_pkt_argv));
 	memcpy(&rpkt, argv.recv_pkt, sizeof(PACKET));
 
-	if(argv.flags & UDP_THREAD_FOR_EACH_PKT)
+	if (argv.flags & UDP_THREAD_FOR_EACH_PKT)
 		pthread_mutex_unlock(&udp_exec_lock);
-	
+
 	/* Drop any packet we sent in broadcast */
-	if(!memcmp(rpkt.from.data, me.cur_ip.data, MAX_IP_SZ)) {
+	if (!memcmp(rpkt.from.data, me.cur_ip.data, MAX_IP_SZ)) {
 		pkt_free(&rpkt, 0);
 		return 0;
 	}
 
-	if(add_accept(rpkt.from, 1)) {
-		ntop=inet_to_str(rpkt.from);
+	if (add_accept(rpkt.from, 1)) {
+		ntop = inet_to_str(rpkt.from);
 		debug(DBG_NORMAL, "ACPT: dropped UDP pkt from %s: "
-				"Accept table full.", ntop);
+			  "Accept table full.", ntop);
 		return 0;
-	} 
+	}
 
 	pkt_exec(rpkt, argv.acpt_idx);
 	pkt_free(&rpkt, 0);
-	
+
 	return 0;
 }
 
@@ -183,11 +185,12 @@ void *udp_exec_pkt(void *passed_argv)
  * udp_daemon: Takes care of receiving udp packets.
  * `passed_argv' is a pointer to a udp_daemon_argv struct
  */
-void *udp_daemon(void *passed_argv)
+void *
+udp_daemon(void *passed_argv)
 {
 	struct udp_daemon_argv argv;
 	struct udp_exec_pkt_argv exec_pkt_argv;
-	
+
 	interface *ifs;
 	int max_sk_idx, dev_sk[me.cur_ifs_n];
 
@@ -195,60 +198,61 @@ void *udp_daemon(void *passed_argv)
 	fd_set fdset;
 	int ret, i, err;
 	u_short udp_port;
-	
+
 	pthread_t thread;
 	pthread_attr_t t_attr;
-	
+
 #ifdef DEBUG
-	int select_errors=0;
+	int select_errors = 0;
 #endif
-	
+
 	memcpy(&argv, passed_argv, sizeof(struct udp_daemon_argv));
-	udp_port=argv.port;
+	udp_port = argv.port;
 	setzero(&exec_pkt_argv, sizeof(struct udp_exec_pkt_argv));
 
-	if(argv.flags & UDP_THREAD_FOR_EACH_PKT) {
+	if (argv.flags & UDP_THREAD_FOR_EACH_PKT) {
 		pthread_attr_init(&t_attr);
 		pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED);
-		exec_pkt_argv.flags|=UDP_THREAD_FOR_EACH_PKT;
+		exec_pkt_argv.flags |= UDP_THREAD_FOR_EACH_PKT;
 	}
 
-	debug(DBG_SOFT, "Preparing the udp listening socket on port %d", udp_port);
-	
-	err=sockets_all_ifs(my_family, SOCK_DGRAM, udp_port, me.cur_ifs,
-				me.cur_ifs_n, dev_sk, &max_sk_idx);
-	if(!err)
+	debug(DBG_SOFT, "Preparing the udp listening socket on port %d",
+		  udp_port);
+
+	err = sockets_all_ifs(my_family, SOCK_DGRAM, udp_port, me.cur_ifs,
+						  me.cur_ifs_n, dev_sk, &max_sk_idx);
+	if (!err)
 		return NULL;
-	else if(err < 0)
+	else if (err < 0)
 		fatal("Creation of the %s daemon aborted. "
-			"Is there another ntkd running?", "udp");
-	
+			  "Is there another ntkd running?", "udp");
+
 	debug(DBG_NORMAL, "Udp daemon on port %d up & running", udp_port);
 	pthread_mutex_unlock(&udp_daemon_lock);
 
 	pthread_mutex_init(&udp_exec_lock, 0);
-	
-	for(;;) {
+
+	for (;;) {
 		FD_ZERO(&fdset);
 
-		if(!me.cur_ifs_n) {
+		if (!me.cur_ifs_n) {
 			/* All the devices have been removed while ntkd was
 			 * running, sleep well */
 			sleep(1);
 			continue;
 		}
 
-		for(i=0; i < me.cur_ifs_n; i++)
-			if(dev_sk[i])
+		for (i = 0; i < me.cur_ifs_n; i++)
+			if (dev_sk[i])
 				FD_SET(dev_sk[i], &fdset);
 
-		ret=select(dev_sk[max_sk_idx]+1, &fdset, NULL, NULL, NULL);
-		if(sigterm_timestamp)
+		ret = select(dev_sk[max_sk_idx] + 1, &fdset, NULL, NULL, NULL);
+		if (sigterm_timestamp)
 			/* NetsukukuD has been closed */
 			break;
 		if (ret < 0) {
 #ifdef DEBUG
-			if(select_errors > 20)
+			if (select_errors > 20)
 				break;
 			select_errors++;
 #endif
@@ -256,37 +260,37 @@ void *udp_daemon(void *passed_argv)
 			continue;
 		}
 
-		for(i=0; i < me.cur_ifs_n; i++) {
-			ifs=&me.cur_ifs[i];
-			if(!dev_sk[i])
+		for (i = 0; i < me.cur_ifs_n; i++) {
+			ifs = &me.cur_ifs[i];
+			if (!dev_sk[i])
 				continue;
-			
-			if(!FD_ISSET(dev_sk[i], &fdset))
+
+			if (!FD_ISSET(dev_sk[i], &fdset))
 				continue;
 
 			setzero(&rpkt, sizeof(PACKET));
 			pkt_addsk(&rpkt, my_family, dev_sk[i], SKT_UDP);
 			pkt_add_dev(&rpkt, ifs, 0);
-			rpkt.flags=MSG_WAITALL;
+			rpkt.flags = MSG_WAITALL;
 			pkt_addport(&rpkt, udp_port);
 
-			if(pkt_recv(&rpkt) < 0) {
+			if (pkt_recv(&rpkt) < 0) {
 				pkt_free(&rpkt, 0);
 				continue;
 			}
 
-			exec_pkt_argv.acpt_idx=accept_idx;
-			exec_pkt_argv.acpt_sidx=accept_sidx;
+			exec_pkt_argv.acpt_idx = accept_idx;
+			exec_pkt_argv.acpt_sidx = accept_sidx;
 
-			if(argv.flags & UDP_THREAD_FOR_EACH_PKT) {
-				exec_pkt_argv.recv_pkt=&rpkt;
+			if (argv.flags & UDP_THREAD_FOR_EACH_PKT) {
+				exec_pkt_argv.recv_pkt = &rpkt;
 				pthread_mutex_lock(&udp_exec_lock);
 				pthread_create(&thread, &t_attr, udp_exec_pkt,
-						&exec_pkt_argv);
+							   &exec_pkt_argv);
 				pthread_mutex_lock(&udp_exec_lock);
 				pthread_mutex_unlock(&udp_exec_lock);
 			} else {
-				exec_pkt_argv.recv_pkt=&rpkt;
+				exec_pkt_argv.recv_pkt = &rpkt;
 				udp_exec_pkt(&exec_pkt_argv);
 			}
 		}
@@ -296,13 +300,14 @@ void *udp_daemon(void *passed_argv)
 	return NULL;
 }
 
-void *tcp_recv_loop(void *recv_pkt)
+void *
+tcp_recv_loop(void *recv_pkt)
 {
 	PACKET rpkt;
 	int acpt_idx, acpt_sidx;
 
-	acpt_idx=accept_idx;
-	acpt_sidx=accept_sidx;
+	acpt_idx = accept_idx;
+	acpt_sidx = accept_sidx;
 	memcpy(&rpkt, recv_pkt, sizeof(PACKET));
 	pthread_mutex_unlock(&tcp_exec_lock);
 
@@ -310,110 +315,112 @@ void *tcp_recv_loop(void *recv_pkt)
 	add_accept_pid(getpid(), acpt_idx, acpt_sidx);
 #endif
 
-	while( pkt_recv(&rpkt) != -1 ) {
-		if(pkt_exec(rpkt, acpt_idx) < 0) {
+	while (pkt_recv(&rpkt) != -1) {
+		if (pkt_exec(rpkt, acpt_idx) < 0) {
 			goto close;
 			break;
 		} else
 			pkt_free(&rpkt, 0);
 	}
 
-close:
+  close:
 	pkt_free(&rpkt, 1);
 	close_accept(acpt_idx, acpt_sidx);
 
 	return NULL;
 }
 
-void *tcp_daemon(void *door)
+void *
+tcp_daemon(void *door)
 {
 	pthread_t thread;
 	pthread_attr_t t_attr;
-	
+
 	PACKET rpkt;
 	struct sockaddr_storage addr;
 	socklen_t addrlen = sizeof addr;
 	inet_prefix ip;
-	
+
 	fd_set fdset;
 	int fd, ret, err, i;
 
 	interface *ifs;
 	int max_sk_idx, dev_sk[me.cur_ifs_n];
-	
-	u_short tcp_port=*(u_short *)door;
+
+	u_short tcp_port = *(u_short *) door;
 	const char *ntop;
 
 	pthread_attr_init(&t_attr);
 	pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED);
-	
-	debug(DBG_SOFT, "Preparing the tcp listening socket on port %d", tcp_port);
 
-	err=sockets_all_ifs(my_family, SOCK_STREAM, tcp_port, me.cur_ifs, 
-				me.cur_ifs_n, dev_sk, &max_sk_idx);
-	if(!err)
+	debug(DBG_SOFT, "Preparing the tcp listening socket on port %d",
+		  tcp_port);
+
+	err = sockets_all_ifs(my_family, SOCK_STREAM, tcp_port, me.cur_ifs,
+						  me.cur_ifs_n, dev_sk, &max_sk_idx);
+	if (!err)
 		return NULL;
-	else if(err < 0)
+	else if (err < 0)
 		fatal("Creation of the %s daemon aborted. "
-			"Is there another ntkd running?", "tcp");
+			  "Is there another ntkd running?", "tcp");
 
 	pthread_mutex_init(&tcp_exec_lock, 0);
 
-	for(i=0; i<me.cur_ifs_n; i++) {
-		if(!dev_sk[i])
+	for (i = 0; i < me.cur_ifs_n; i++) {
+		if (!dev_sk[i])
 			continue;
 		/* 
 		 * While we are accepting the connections we keep the socket non
 		 * blocking.
 		 */
-		if(set_nonblock_sk(dev_sk[i])) {
-		  pthread_mutex_unlock(&tcp_daemon_lock);
-		  return NULL;
+		if (set_nonblock_sk(dev_sk[i])) {
+			pthread_mutex_unlock(&tcp_daemon_lock);
+			return NULL;
 		}
-		
- 		/* Shhh, it's listening... */
-  		if(listen(dev_sk[i], 5) == -1) {
-  			inet_close(&dev_sk[i]);
+
+		/* Shhh, it's listening... */
+		if (listen(dev_sk[i], 5) == -1) {
+			inet_close(&dev_sk[i]);
 			pthread_mutex_unlock(&tcp_daemon_lock);
-  			return NULL;
-  		}
-  	}
-	
+			return NULL;
+		}
+	}
+
 	debug(DBG_NORMAL, "Tcp daemon on port %d up & running", tcp_port);
 	pthread_mutex_unlock(&tcp_daemon_lock);
-	for(;;) {
+	for (;;) {
 		FD_ZERO(&fdset);
 
-		if(!me.cur_ifs_n) {
+		if (!me.cur_ifs_n) {
 			/* All the devices have been removed while ntkd was
 			 * running, sleep well */
 			sleep(1);
 			continue;
 		}
 
-		for(i=0; i < me.cur_ifs_n; i++)
-			if(dev_sk[i])
+		for (i = 0; i < me.cur_ifs_n; i++)
+			if (dev_sk[i])
 				FD_SET(dev_sk[i], &fdset);
 
-		ret=select(dev_sk[max_sk_idx]+1, &fdset, NULL, NULL, NULL);
-		if(sigterm_timestamp)
+		ret = select(dev_sk[max_sk_idx] + 1, &fdset, NULL, NULL, NULL);
+		if (sigterm_timestamp)
 			/* NetsukukuD has been closed */
 			break;
-		if(ret < 0 && errno != EINTR)
+		if (ret < 0 && errno != EINTR)
 			error("daemon_tcp: select error: %s", strerror(errno));
-		if(ret < 0)
+		if (ret < 0)
 			continue;
 
-		for(i=0; i < me.cur_ifs_n; i++) {
-			ifs=&me.cur_ifs[i];
-			if(!dev_sk[i])
+		for (i = 0; i < me.cur_ifs_n; i++) {
+			ifs = &me.cur_ifs[i];
+			if (!dev_sk[i])
 				continue;
 
-			if(!FD_ISSET(dev_sk[i], &fdset))
+			if (!FD_ISSET(dev_sk[i], &fdset))
 				continue;
 
-			fd=accept(dev_sk[i], (struct sockaddr *)&addr, &addrlen);
-			if(fd == -1) {
+			fd = accept(dev_sk[i], (struct sockaddr *) &addr, &addrlen);
+			if (fd == -1) {
 				if (errno != EINTR && errno != EWOULDBLOCK)
 					error("daemon_tcp: accept(): %s", strerror(errno));
 				continue;
@@ -422,18 +429,18 @@ void *tcp_daemon(void *door)
 			setzero(&rpkt, sizeof(PACKET));
 			pkt_addsk(&rpkt, my_family, fd, SKT_TCP);
 			pkt_add_dev(&rpkt, ifs, 0);
-			rpkt.flags=MSG_WAITALL;
+			rpkt.flags = MSG_WAITALL;
 			pkt_addport(&rpkt, tcp_port);
 
-			ntop=0;
-			sockaddr_to_inet((struct sockaddr *)&addr, &ip, 0);
+			ntop = 0;
+			sockaddr_to_inet((struct sockaddr *) &addr, &ip, 0);
 			pkt_addfrom(&rpkt, &ip);
-			if(server_opt.dbg_lvl)
-				ntop=inet_to_str(ip);
+			if (server_opt.dbg_lvl)
+				ntop = inet_to_str(ip);
 
-			if((ret=add_accept(ip, 0))) {
+			if ((ret = add_accept(ip, 0))) {
 				debug(DBG_NORMAL, "ACPT: drop connection with %s: "
-						"Accept table full.", ntop);
+					  "Accept table full.", ntop);
 
 				/* Omg, we cannot take it anymore, go away: ACK_NEGATIVE */
 				pkt_err(rpkt, ret, 1);
@@ -448,11 +455,13 @@ void *tcp_daemon(void *door)
 				send_rq(&rpkt, 0, ACK_AFFERMATIVE, 0, 0, 0, 0);
 			}
 
-			if(unset_nonblock_sk(fd))
+			if (unset_nonblock_sk(fd))
 				continue;
 
 			pthread_mutex_lock(&tcp_exec_lock);
-			err=pthread_create(&thread, &t_attr, tcp_recv_loop, (void *)&rpkt);
+			err =
+				pthread_create(&thread, &t_attr, tcp_recv_loop,
+							   (void *) &rpkt);
 			pthread_detach(thread);
 			pthread_mutex_lock(&tcp_exec_lock);
 			pthread_mutex_unlock(&tcp_exec_lock);

src/daemon.h

@@ -28,28 +28,29 @@ pthread_mutex_t tcp_daemon_lock;
 
 /* flags for udp_exec_pkt_argv and udp_daemon_argv */
 #define UDP_THREAD_FOR_EACH_PKT		1	/* For each incoming udp
-						   packets use threads */
+										   packets use threads */
 
 /* Argv passed to udp_exec_pkt() */
 struct udp_exec_pkt_argv {
-	PACKET 		*recv_pkt;
-	int		acpt_idx;
-	int		acpt_sidx;
-	u_char		flags;
+	PACKET *recv_pkt;
+	int acpt_idx;
+	int acpt_sidx;
+	u_char flags;
 };
 
 /* Argv passed to udp_daemon */
 struct udp_daemon_argv {
-	u_short		port;
-	u_char		flags;
+	u_short port;
+	u_char flags;
 };
 
 pthread_mutex_t udp_exec_lock;
 pthread_mutex_t tcp_exec_lock;
 
-int prepare_listen_socket(int family, int socktype, u_short port, interface *dev);
+int prepare_listen_socket(int family, int socktype, u_short port,
+						  interface * dev);
 void *tcp_recv_loop(void *recv_pkt);
 void *tcp_daemon(void *null);
 void *udp_daemon(void *door);
 
-#endif /*DAEMON_H*/
+#endif							/*DAEMON_H */

src/dns_wrapper.c

@@ -52,7 +52,8 @@
  * the reply to from.
  * `passed_argv' is a pointer to a dns_exec_pkt_argv struct.
  */
-void *dns_exec_pkt(void *passed_argv)
+void *
+dns_exec_pkt(void *passed_argv)
 {
 	struct dns_exec_pkt_argv argv;
 
@@ -71,16 +72,19 @@ void *dns_exec_pkt(void *passed_argv)
 	}
 
 	/* Unpack the DNS query and resolve the hostname */
-	if(!andns_rslv(buf, argv.rpkt_sz, answer_buffer, &answer_length))
+	if (!andns_rslv(buf, argv.rpkt_sz, answer_buffer, &answer_length))
 		return 0;
 
 	/* Send the DNS reply */
-	bytes_sent=inet_sendto(argv.sk, answer_buffer, answer_length, 0,
-			&argv.from, argv.from_len);
-        error("bytes_sent is: %d argv.sk is: %d answer_buffer is: %s answer_length is: %d argv.from is: %p agrv.from_len is: %p", bytes_sent,argv.sk, answer_buffer, answer_length, argv.from, argv.from_len);
-	if(bytes_sent != answer_length)
+	bytes_sent = inet_sendto(argv.sk, answer_buffer, answer_length, 0,
+							 &argv.from, argv.from_len);
+	error
+		("bytes_sent is: %d argv.sk is: %d answer_buffer is: %s answer_length is: %d argv.from is: %p agrv.from_len is: %p",
+		 bytes_sent, argv.sk, answer_buffer, answer_length, argv.from,
+		 argv.from_len);
+	if (bytes_sent != answer_length)
 		debug(DBG_SOFT, ERROR_MSG "inet_sendto error: %s", ERROR_POS,
-				strerror(errno));
+			  strerror(errno));
 
 	return 0;
 }
@@ -90,7 +94,8 @@ void *dns_exec_pkt(void *passed_argv)
  * replies with a DNS reply.
  * It listens to `port'.
  */
-void dns_wrapper_daemon(u_short port)
+void
+dns_wrapper_daemon(u_short port)
 {
 	struct dns_exec_pkt_argv exec_pkt_argv;
 	char buf[MAX_DNS_PKT_SZ];
@@ -99,44 +104,45 @@ void dns_wrapper_daemon(u_short port)
 	int ret, sk;
 	pthread_t thread;
 	pthread_attr_t t_attr;
-	ssize_t err=-1;
+	ssize_t err = -1;
 
 #ifdef DEBUG
-	int select_errors=0;
+	int select_errors = 0;
 #endif
 
 	pthread_attr_init(&t_attr);
 	pthread_attr_setdetachstate(&t_attr, PTHREAD_CREATE_DETACHED);
 	pthread_mutex_init(&dns_exec_lock, 0);
 
-	debug(DBG_SOFT, "Preparing the dns_udp listening socket on port %d", port);
-	sk=prepare_listen_socket(my_family, SOCK_DGRAM, port, 0);
-	if(sk == -1)
+	debug(DBG_SOFT, "Preparing the dns_udp listening socket on port %d",
+		  port);
+	sk = prepare_listen_socket(my_family, SOCK_DGRAM, port, 0);
+	if (sk == -1)
 		return;
 
 	debug(DBG_NORMAL, "DNS wrapper daemon on port %d up & running", port);
-	for(;;) {
-		if(!sk)
+	for (;;) {
+		if (!sk)
 			fatal("The dns_wrapper_daemon socket got corrupted");
 
 		FD_ZERO(&fdset);
 		FD_SET(sk, &fdset);
 
-		ret = select(sk+1, &fdset, NULL, NULL, NULL);
-		if(sigterm_timestamp)
+		ret = select(sk + 1, &fdset, NULL, NULL, NULL);
+		if (sigterm_timestamp)
 			/* NetsukukuD has been closed */
 			break;
 		if (ret < 0) {
 #ifdef DEBUG
-			if(select_errors > 20)
+			if (select_errors > 20)
 				break;
 			select_errors++;
 #endif
 			error("dns_wrapper_daemonp: select error: %s",
-					strerror(errno));
+				  strerror(errno));
 			continue;
 		}
-		if(!FD_ISSET(sk, &fdset))
+		if (!FD_ISSET(sk, &fdset))
 			continue;
 
 		setzero(&buf, MAX_DNS_PKT_SZ);
@@ -147,28 +153,29 @@ void dns_wrapper_daemon(u_short port)
 			sizeof(struct sockaddr_in) : sizeof(struct sockaddr_in6);
 
 		/* we get the DNS query */
-		err=inet_recvfrom(sk, buf, MAX_DNS_PKT_SZ, MSG_WAITALL,
-				&exec_pkt_argv.from, &exec_pkt_argv.from_len);
-		if(err < 0) {
+		err = inet_recvfrom(sk, buf, MAX_DNS_PKT_SZ, MSG_WAITALL,
+							&exec_pkt_argv.from, &exec_pkt_argv.from_len);
+		if (err < 0) {
 			debug(DBG_NOISE, "dns_wrapper_daemonp: recv of the dns"
-					" query pkt aborted!");
+				  " query pkt aborted!");
 			continue;
 		}
 
 		/* Exec the pkt in another thread */
-		exec_pkt_argv.sk=sk;
-		exec_pkt_argv.rpkt_sz=err;
-		exec_pkt_argv.rpkt=buf;
+		exec_pkt_argv.sk = sk;
+		exec_pkt_argv.rpkt_sz = err;
+		exec_pkt_argv.rpkt = buf;
 
 		pthread_mutex_lock(&dns_exec_lock);
 		pthread_create(&thread, &t_attr, dns_exec_pkt,
-				(void *)&exec_pkt_argv);
+					   (void *) &exec_pkt_argv);
 		pthread_mutex_lock(&dns_exec_lock);
 		pthread_mutex_unlock(&dns_exec_lock);
 	}
 }
 
-void *dns_wrapper_thread(void *null)
+void *
+dns_wrapper_thread(void *null)
 {
 	dns_wrapper_daemon(DNS_WRAPPER_PORT);
 	return 0;

src/dns_wrapper.h

@@ -24,21 +24,20 @@
 #define MIN_PKT_SZ		7
 
 /* DNS wrapper resolver api */
-void resolver_process(const char *question, unsigned question_length, 
-		char *answer, unsigned *answer_length,
-		int (*callback)(const char *name, uint32_t *ip));
+void resolver_process(const char *question, unsigned question_length,
+					  char *answer, unsigned *answer_length,
+					  int (*callback) (const char *name, uint32_t * ip));
 
 /*
  * dns_exec_pkt_argv is the struct passed to dns_exec_pkt() as argument 
  */
-struct dns_exec_pkt_argv 
-{
-	char		*rpkt;	/* Received dns query pkt */
-	ssize_t		rpkt_sz;
-
-	int		sk;
-	struct sockaddr	from;
-	socklen_t	from_len;
+struct dns_exec_pkt_argv {
+	char *rpkt;					/* Received dns query pkt */
+	ssize_t rpkt_sz;
+
+	int sk;
+	struct sockaddr from;
+	socklen_t from_len;
 };
 
 pthread_mutex_t dns_exec_lock;
@@ -47,4 +46,4 @@ pthread_mutex_t dns_exec_lock;
 
 void *dns_wrapper_thread(void *null);
 
-#endif /*DNS_WRAPPER_H*/
+#endif							/*DNS_WRAPPER_H */

src/dnslib.h

@@ -1,4 +1,4 @@
-                 /**************************************
+				 /**************************************
                 *     AUTHOR: Federico Tomassini        *
                *     Copyright (C) Federico Tomassini    *
               *     Contact effetom@gmail.com             *
@@ -25,30 +25,30 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-#define LBL_PTR_MASK		0xC0                    /* Network byte order */
-#define LBL_PTR_OFF_MASK	0x3f                   /* N.b. order */
-#define LBL_PTR(c)		((c)&LBL_PTR_MASK)      /* AND whith 0xC000 */
+#define LBL_PTR_MASK		0xC0	/* Network byte order */
+#define LBL_PTR_OFF_MASK	0x3f	/* N.b. order */
+#define LBL_PTR(c)		((c)&LBL_PTR_MASK)	/* AND whith 0xC000 */
 
 #define MAX_RECURSION_PTR	20
 
 /* PREFIXES FOR PTR QUERY */
 #define DNS_INV_PREFIX          ".IN-ADDR.ARPA"
 #define DNS_INV_PREFIX6         ".IP6.ARPA"
-#define OLD_DNS_INV_PREFIX6     ".IP6.INT" /* For backward compatibility */
+#define OLD_DNS_INV_PREFIX6     ".IP6.INT"	/* For backward compatibility */
 
 /* DNS QUERY-TYPE: others type will be discarded */
 
-#define T_AAAA  28      /* h->ip IPV6  */
-#define T_A     1       /* h->ip IPV4 */
-#define T_PTR   12      /* ip->h */
-#define T_MX    15      /* h->mx */
+#define T_AAAA  28				/* h->ip IPV6  */
+#define T_A     1				/* h->ip IPV4 */
+#define T_PTR   12				/* ip->h */
+#define T_MX    15				/* h->mx */
 /* RCODES */
-#define DNS_RCODE_NOERR     0       /* No error */
-#define DNS_RCODE_EINTRPRT  1       /* Intepret error */
-#define DNS_RCODE_ESRVFAIL  2       /* Server failure */
-#define DNS_RCODE_ENSDMN    3       /* No such domain */
-#define DNS_RCODE_ENIMPL    4       /* Not implemented */
-#define DNS_RCODE_ERFSD     5       /* Refused */
+#define DNS_RCODE_NOERR     0	/* No error */
+#define DNS_RCODE_EINTRPRT  1	/* Intepret error */
+#define DNS_RCODE_ESRVFAIL  2	/* Server failure */
+#define DNS_RCODE_ENSDMN    3	/* No such domain */
+#define DNS_RCODE_ENIMPL    4	/* Not implemented */
+#define DNS_RCODE_ERFSD     5	/* Refused */
 
 /* INET CLASS */
 #define C_IN    1
@@ -63,19 +63,19 @@
 #define min(x,y)		((x)<(y))?(x):(y)
 
 typedef struct dns_pkt_hdr {
-        uint16_t       id;
-        uint8_t        qr;
-        uint8_t        opcode;
-        uint8_t        aa;
-        uint8_t        tc;
-        uint8_t        rd;
-        uint8_t        ra;
-        uint8_t        z;
-        uint8_t        rcode;
-        uint8_t        qdcount;
-        uint8_t        ancount;
-        uint8_t        nscount;
-        uint8_t        arcount;
+	uint16_t id;
+	uint8_t qr;
+	uint8_t opcode;
+	uint8_t aa;
+	uint8_t tc;
+	uint8_t rd;
+	uint8_t ra;
+	uint8_t z;
+	uint8_t rcode;
+	uint8_t qdcount;
+	uint8_t ancount;
+	uint8_t nscount;
+	uint8_t arcount;
 } dns_pkt_hdr;
 #define DNS_PKT_HDR_SZ sizeof(dns_pkt_hdr)
 
@@ -87,34 +87,32 @@ typedef struct dns_pkt_hdr {
 
 
 struct dns_pkt_qst {
-        char                    qname[DNS_MAX_HNAME_LEN];
-        uint16_t                qtype;
-        uint16_t                qclass;
-        struct dns_pkt_qst      *next;
+	char qname[DNS_MAX_HNAME_LEN];
+	uint16_t qtype;
+	uint16_t qclass;
+	struct dns_pkt_qst *next;
 };
 typedef struct dns_pkt_qst dns_pkt_qst;
 #define DNS_PKT_QST_SZ sizeof(dns_pkt_qst)
 
-struct dns_pkt_a
-{
-        char                    name[DNS_MAX_HNAME_LEN];
-        uint16_t                type;
-        uint16_t                cl;
-        uint32_t                ttl;
-        uint16_t                rdlength;
-        char                    rdata[DNS_MAX_HNAME_LEN];
-        struct dns_pkt_a        *next;
+struct dns_pkt_a {
+	char name[DNS_MAX_HNAME_LEN];
+	uint16_t type;
+	uint16_t cl;
+	uint32_t ttl;
+	uint16_t rdlength;
+	char rdata[DNS_MAX_HNAME_LEN];
+	struct dns_pkt_a *next;
 };
 typedef struct dns_pkt_a dns_pkt_a;
 #define DNS_PKT_A_SZ sizeof(dns_pkt_a)
 
-typedef struct dns_pkt
-{
-        dns_pkt_hdr     pkt_hdr;
-        dns_pkt_qst     *pkt_qst;
-        dns_pkt_a       *pkt_answ;
-        dns_pkt_a       *pkt_auth;
-        dns_pkt_a       *pkt_add;
+typedef struct dns_pkt {
+	dns_pkt_hdr pkt_hdr;
+	dns_pkt_qst *pkt_qst;
+	dns_pkt_a *pkt_answ;
+	dns_pkt_a *pkt_auth;
+	dns_pkt_a *pkt_add;
 } dns_pkt;
 #define DNS_PKT_SZ sizeof(dns_pkt)
 
@@ -147,43 +145,44 @@ typedef struct dns_pkt
 #define DNS_SET_NSCOUNT(dp,x)	(dp)->pkt_hdr.nscount=x
 #define DNS_SET_ARCOUNT(dp,x)	(dp)->pkt_hdr.arcount=x
 
-#define DP_ADD_ANSWER(dp)       dns_add_a(&((dp)->pkt_answ));DP_ANCOUNT(dp)+=1;	
-#define DP_ADD_AUTH(dp)         dns_add_a(&((dp)->pkt_auth));DP_NSCOUNT(dp)+=1;	
-#define DP_ADD_ADD(dp)          dns_add_a(&((dp)->pkt_add));DP_ARCOUNT(dp)+=1;	
+#define DP_ADD_ANSWER(dp)       dns_add_a(&((dp)->pkt_answ));DP_ANCOUNT(dp)+=1;
+#define DP_ADD_AUTH(dp)         dns_add_a(&((dp)->pkt_auth));DP_NSCOUNT(dp)+=1;
+#define DP_ADD_ADD(dp)          dns_add_a(&((dp)->pkt_add));DP_ARCOUNT(dp)+=1;
 
 
 	/* Functions */
 int getlblptr(char *buf);
-int read_label_octet(const char *src,char *dst,int limit);
-int lbltoname(char *buf,char *start_pkt,char *dst,int limit);
-int swap_straddr(char *src,char *dst);
-int swap_straddr6(char *src,char *dst);
-int rm_inv_prefix(char *src,char *dst) ;
-int add_inv_prefix(char *s,int family);
-int swapped_straddr(char *src,char *dst) ;
-int swapped_straddr_pref(char *src,char *dst,int family);
-int nametolbl(char *name,char *dst);
-int d_hdr_u(char *buf,dns_pkt_hdr *dph);
-int d_qst_u(char *start_buf,char *buf,dns_pkt *dp,int limit_len);
-int d_qsts_u(char *start_buf,char *buf,dns_pkt *dp,int limit_len);
-int d_a_u(char *start_buf,char *buf,dns_pkt_a **dpa_orig,int limit_len);
-int d_as_u(char *start_buf,char *buf,dns_pkt_a **dpa,int limit_len,int count);
-int d_u(char *buf,int pktlen,dns_pkt **dpp);
-int d_hdr_p(dns_pkt *dp,char *buf);
-int d_qst_p(dns_pkt_qst *dpq,char *buf, int limitlen);
-int d_qsts_p(dns_pkt *dp,char *buf,int limitlen);
-int d_a_p(dns_pkt_a *dpa,char *buf,int limitlen);
-int d_as_p(dns_pkt_a *dpa,char *buf,int limitlen,int count);
-int d_p(dns_pkt *dp,char *buf);
-dns_pkt* create_dns_pkt(void);
-dns_pkt_qst* create_dns_pkt_qst(void);
-dns_pkt_a* create_dns_pkt_a(void);
-dns_pkt_qst* dns_add_qst(dns_pkt *dp);
-void dns_del_last_qst(dns_pkt *dp);
-dns_pkt_a* dns_add_a(dns_pkt_a **dpa);
-void dns_a_default_fill(dns_pkt *dp,dns_pkt_a *dpa);
-void destroy_dns_pkt(dns_pkt *dp);
-
-
-#endif /* DNSLIB_H */
-
+int read_label_octet(const char *src, char *dst, int limit);
+int lbltoname(char *buf, char *start_pkt, char *dst, int limit);
+int swap_straddr(char *src, char *dst);
+int swap_straddr6(char *src, char *dst);
+int rm_inv_prefix(char *src, char *dst);
+int add_inv_prefix(char *s, int family);
+int swapped_straddr(char *src, char *dst);
+int swapped_straddr_pref(char *src, char *dst, int family);
+int nametolbl(char *name, char *dst);
+int d_hdr_u(char *buf, dns_pkt_hdr * dph);
+int d_qst_u(char *start_buf, char *buf, dns_pkt * dp, int limit_len);
+int d_qsts_u(char *start_buf, char *buf, dns_pkt * dp, int limit_len);
+int d_a_u(char *start_buf, char *buf, dns_pkt_a ** dpa_orig,
+		  int limit_len);
+int d_as_u(char *start_buf, char *buf, dns_pkt_a ** dpa, int limit_len,
+		   int count);
+int d_u(char *buf, int pktlen, dns_pkt ** dpp);
+int d_hdr_p(dns_pkt * dp, char *buf);
+int d_qst_p(dns_pkt_qst * dpq, char *buf, int limitlen);
+int d_qsts_p(dns_pkt * dp, char *buf, int limitlen);
+int d_a_p(dns_pkt_a * dpa, char *buf, int limitlen);
+int d_as_p(dns_pkt_a * dpa, char *buf, int limitlen, int count);
+int d_p(dns_pkt * dp, char *buf);
+dns_pkt *create_dns_pkt(void);
+dns_pkt_qst *create_dns_pkt_qst(void);
+dns_pkt_a *create_dns_pkt_a(void);
+dns_pkt_qst *dns_add_qst(dns_pkt * dp);
+void dns_del_last_qst(dns_pkt * dp);
+dns_pkt_a *dns_add_a(dns_pkt_a ** dpa);
+void dns_a_default_fill(dns_pkt * dp, dns_pkt_a * dpa);
+void destroy_dns_pkt(dns_pkt * dp);
+
+
+#endif							/* DNSLIB_H */

src/endianness.c

@@ -40,50 +40,54 @@
 
 #define IS_DYNAMIC(i) ({do_nothing();})
 
-#endif	/*DEBUG*/
-
-void *int_info_copy(int_info *dst, const int_info *src)
+#endif /*DEBUG*/
+void *
+int_info_copy(int_info * dst, const int_info * src)
 {
 	return memcpy(dst, src, sizeof(int_info));
 }
-		
-void ints_array_ntohl(int *hostlong, int nmemb)
+
+void
+ints_array_ntohl(int *hostlong, int nmemb)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	int i;
-	
-	for(i=0; i<nmemb; i++)
-		hostlong[i]=ntohl(hostlong[i]);
+
+	for (i = 0; i < nmemb; i++)
+		hostlong[i] = ntohl(hostlong[i]);
 #endif
 }
 
-void ints_array_htonl(int *netlong, int nmemb)
+void
+ints_array_htonl(int *netlong, int nmemb)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	int i;
-	
-	for(i=0; i<nmemb; i++)
-		netlong[i]=htonl(netlong[i]);
+
+	for (i = 0; i < nmemb; i++)
+		netlong[i] = htonl(netlong[i]);
 #endif
 }
 
-void ints_array_ntohs(short *hostshort, int nmemb)
+void
+ints_array_ntohs(short *hostshort, int nmemb)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	int i;
-	
-	for(i=0; i<nmemb; i++)
-		hostshort[i]=ntohs(hostshort[i]);
+
+	for (i = 0; i < nmemb; i++)
+		hostshort[i] = ntohs(hostshort[i]);
 #endif
 }
 
-void ints_array_htons(short *netshort, int nmemb)
+void
+ints_array_htons(short *netshort, int nmemb)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	int i;
-	
-	for(i=0; i<nmemb; i++)
-		netshort[i]=htons(netshort[i]);
+
+	for (i = 0; i < nmemb; i++)
+		netshort[i] = htons(netshort[i]);
 #endif
 }
 
@@ -93,7 +97,8 @@ void ints_array_htons(short *netshort, int nmemb)
  * struct `s' from network order to host order. The `s' struct must be
  * described in the `iinfo' struct.
  */
-void ints_network_to_host(void *s, int_info iinfo)
+void
+ints_network_to_host(void *s, int_info iinfo)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 
@@ -101,15 +106,15 @@ void ints_network_to_host(void *s, int_info iinfo)
 	char *p;
 
 	IS_DYNAMIC(iinfo.total_ints);
-	
-	for(i=0; i < iinfo.total_ints; i++) {
-		if(!iinfo.int_type[i])
+
+	for (i = 0; i < iinfo.total_ints; i++) {
+		if (!iinfo.int_type[i])
 			continue;
 
 		IS_DYNAMIC(iinfo.int_offset[i]);
-		
-		p=(char *)s + iinfo.int_offset[i];
-		
+
+		p = (char *) s + iinfo.int_offset[i];
+
 		IS_DYNAMIC(iinfo.int_nmemb[i]);
 		IS_DYNAMIC(iinfo.int_type[i]);
 
@@ -117,20 +122,19 @@ void ints_network_to_host(void *s, int_info iinfo)
 		 * Swap the entire array if it is a single integer and if we 
 		 * are on a little endian machine.
 		 */
-		if(iinfo.int_type[i] & INT_TYPE_WORDS) {
-			
-			if(iinfo.int_type[i] & INT_TYPE_32BIT)
-				swap_ints(iinfo.int_nmemb[i], (u_int *)p,
-						(u_int *)p);
+		if (iinfo.int_type[i] & INT_TYPE_WORDS) {
+
+			if (iinfo.int_type[i] & INT_TYPE_32BIT)
+				swap_ints(iinfo.int_nmemb[i], (u_int *) p, (u_int *) p);
 			else
-				swap_shorts(iinfo.int_nmemb[i], (u_short *)p,
-						(u_short *)p);
+				swap_shorts(iinfo.int_nmemb[i], (u_short *) p,
+							(u_short *) p);
 		}
-		
-		if(iinfo.int_type[i] & INT_TYPE_32BIT)
-			ints_array_ntohl((int *)p, iinfo.int_nmemb[i]);
+
+		if (iinfo.int_type[i] & INT_TYPE_32BIT)
+			ints_array_ntohl((int *) p, iinfo.int_nmemb[i]);
 		else
-			ints_array_ntohs((short *)p, iinfo.int_nmemb[i]);
+			ints_array_ntohs((short *) p, iinfo.int_nmemb[i]);
 	}
 #endif
 }
@@ -140,7 +144,8 @@ void ints_network_to_host(void *s, int_info iinfo)
  * struct `s' from host order to network order. The `s' struct must be
  * described in the `iinfo' struct.
  */
-void ints_host_to_network(void *s, int_info iinfo)
+void
+ints_host_to_network(void *s, int_info iinfo)
 {
 #if BYTE_ORDER == LITTLE_ENDIAN
 	int i;
@@ -148,14 +153,14 @@ void ints_host_to_network(void *s, int_info iinfo)
 
 	IS_DYNAMIC(iinfo.total_ints);
 
-	for(i=0; i < iinfo.total_ints; i++) {
-		if(!iinfo.int_type[i])
+	for (i = 0; i < iinfo.total_ints; i++) {
+		if (!iinfo.int_type[i])
 			continue;
 
 		IS_DYNAMIC(iinfo.int_offset[i]);
 
-		p=(char *)s + iinfo.int_offset[i];
-		
+		p = (char *) s + iinfo.int_offset[i];
+
 		IS_DYNAMIC(iinfo.int_nmemb[i]);
 		IS_DYNAMIC(iinfo.int_type[i]);
 
@@ -163,18 +168,19 @@ void ints_host_to_network(void *s, int_info iinfo)
 		 * Swap the entire array if it is a single integer and if we 
 		 * are on a little endian machine.
 		 */
-		if(iinfo.int_type[i] & INT_TYPE_WORDS) {
-			
-			if(iinfo.int_type[i] & INT_TYPE_32BIT)
-				swap_ints(iinfo.int_nmemb[i], (u_int *)p, (u_int *)p);
+		if (iinfo.int_type[i] & INT_TYPE_WORDS) {
+
+			if (iinfo.int_type[i] & INT_TYPE_32BIT)
+				swap_ints(iinfo.int_nmemb[i], (u_int *) p, (u_int *) p);
 			else
-				swap_shorts(iinfo.int_nmemb[i], (u_short *)p, (u_short *)p);
+				swap_shorts(iinfo.int_nmemb[i], (u_short *) p,
+							(u_short *) p);
 		}
 
-		if(iinfo.int_type[i] & INT_TYPE_32BIT)
-			ints_array_htonl((int *)p, iinfo.int_nmemb[i]);
+		if (iinfo.int_type[i] & INT_TYPE_32BIT)
+			ints_array_htonl((int *) p, iinfo.int_nmemb[i]);
 		else
-			ints_array_htons((short *)p, iinfo.int_nmemb[i]);
+			ints_array_htons((short *) p, iinfo.int_nmemb[i]);
 	}
 #endif
 }
@@ -183,7 +189,8 @@ void ints_host_to_network(void *s, int_info iinfo)
  * ints_printf: prints all the int/short vars present in the `s' struct
  * described by `iinfo'. It uses `print_func' as the the printing function
  */
-void ints_printf(void *s, int_info iinfo, void(*print_func(const char *, ...)))
+void
+ints_printf(void *s, int_info iinfo, void (*print_func(const char *, ...)))
 {
 	int i, e, *i32;
 	short *i16;
@@ -191,27 +198,27 @@ void ints_printf(void *s, int_info iinfo, void(*print_func(const char *, ...)))
 
 	IS_DYNAMIC(iinfo.total_ints);
 
-	for(i=0; i < iinfo.total_ints; i++) {
-		if(!iinfo.int_type[i])
+	for (i = 0; i < iinfo.total_ints; i++) {
+		if (!iinfo.int_type[i])
 			continue;
 
 		IS_DYNAMIC(iinfo.int_offset[i]);
 
-		p=(char *)s + iinfo.int_offset[i];
-		
+		p = (char *) s + iinfo.int_offset[i];
+
 		IS_DYNAMIC(iinfo.int_nmemb[i]);
 		IS_DYNAMIC(iinfo.int_type[i]);
 
-		for(e=0; e < iinfo.int_nmemb[i]; e++) {
+		for (e = 0; e < iinfo.int_nmemb[i]; e++) {
+
+			print_func("ints_printf: offset %d, nmemb %d, ",
+					   iinfo.int_offset[i], e);
 
-			print_func("ints_printf: offset %d, nmemb %d, ", 
-					iinfo.int_offset[i], e);
-			
-			if(iinfo.int_type[i] & INT_TYPE_32BIT) {
-				i32  = (int *)(p + (sizeof(int) * e));
+			if (iinfo.int_type[i] & INT_TYPE_32BIT) {
+				i32 = (int *) (p + (sizeof(int) * e));
 				print_func("32bit value %d\n", *i32);
 			} else {
-				i16  = (short *)(p + (sizeof(short) * e));
+				i16 = (short *) (p + (sizeof(short) * e));
 				print_func("16bit value %d\n", *i16);
 			}
 		}

src/endianness.h

@@ -19,24 +19,24 @@
 #ifndef ENDIANNESS_H
 #define ENDIANNESS_H
 
-#define MAX_INTS_PER_STRUCT	8		/* The maximum number of short/int variables 
-						   present in a struct */
+#define MAX_INTS_PER_STRUCT	8	/* The maximum number of short/int variables 
+								   present in a struct */
 
-#define IINFO_DYNAMIC_VALUE	-1		/* This define is used to fill part in a 
-						   int_info struct that must be set each time. 
-						   If that part is not set, -1 will remain, and
-						   the int_info functions will call fatal(). 
-						   Therefore this is useful to track bugs. */
+#define IINFO_DYNAMIC_VALUE	-1	/* This define is used to fill part in a 
+								   int_info struct that must be set each time. 
+								   If that part is not set, -1 will remain, and
+								   the int_info functions will call fatal(). 
+								   Therefore this is useful to track bugs. */
 
 
 /* flags for int_info.int_type */
-#define INT_TYPE_VOID		0		/* Emptiness is loneliness, and loneliness is 
-						   cleanliness */
-#define INT_TYPE_32BIT		1		/* The int var is of 32 bits */
-#define INT_TYPE_16BIT		(1<<1)		/* The int var is of 16 bits */
-#define INT_TYPE_WORDS		(1<<2)		/* The int var is composed by an array of ints,
-						   like the ipv6 ip (struct in6_addr) */
-#define INT_TYPE_NETWORK 	(1<<3)		/* The int var is stored in network order */
+#define INT_TYPE_VOID		0	/* Emptiness is loneliness, and loneliness is 
+								   cleanliness */
+#define INT_TYPE_32BIT		1	/* The int var is of 32 bits */
+#define INT_TYPE_16BIT		(1<<1)	/* The int var is of 16 bits */
+#define INT_TYPE_WORDS		(1<<2)	/* The int var is composed by an array of ints,
+									   like the ipv6 ip (struct in6_addr) */
+#define INT_TYPE_NETWORK 	(1<<3)	/* The int var is stored in network order */
 
 /*
  * int_info: this struct is used to keep the information about the int/short
@@ -66,23 +66,22 @@
  *		           { 1, 1, 4 }
  *			 };
  */
-typedef struct
-{
+typedef struct {
 	/* The total int/short vars present in the struct */
-	int 	total_ints;				
+	int total_ints;
 
 	/* Each member in the int_type array corresponds to a int/short var
 	 * and it is set using the above INT_TYPE_ flags */
-	char 	int_type[MAX_INTS_PER_STRUCT];
+	char int_type[MAX_INTS_PER_STRUCT];
 
 	/* Each member in the int_offset array specifies the amount of bytes
 	 * to be added at the end of the struct to get the relative int/short
 	 * var. */
-	size_t	int_offset[MAX_INTS_PER_STRUCT];
+	size_t int_offset[MAX_INTS_PER_STRUCT];
 
 	/* int_nmemb[x] is equal to the number of consecutive ints/shorts var,
 	 * which start at the int_offset[x] offset. */
-	size_t	int_nmemb[MAX_INTS_PER_STRUCT];
+	size_t int_nmemb[MAX_INTS_PER_STRUCT];
 
 } int_info;
 
@@ -97,13 +96,14 @@ typedef struct
 
 
 /* * * Functions declaration * * */
-void *int_info_copy(int_info *dst, const int_info *src);
+void *int_info_copy(int_info * dst, const int_info * src);
 void ints_array_htons(short *netshort, int nmemb);
 void ints_array_ntohs(short *hostshort, int nmemb);
 void ints_array_htonl(int *netlong, int nmemb);
 void ints_array_ntohl(int *hostlong, int nmemb);
 void ints_network_to_host(void *s, int_info iinfo);
 void ints_host_to_network(void *s, int_info iinfo);
-void ints_printf(void *s, int_info iinfo, void(*print_func(const char *, ...)));
+void ints_printf(void *s, int_info iinfo,
+				 void (*print_func(const char *, ...)));
 
-#endif /*ENDIANNESS_H*/
+#endif							/*ENDIANNESS_H */

src/err_errno.c

@@ -1,4 +1,4 @@
-                 /**************************************
+				 /**************************************
                 *     AUTHOR: Federico Tomassini        *
                *     Copyright (C) Federico Tomassini    *
               *     Contact effetom@gmail.com             *
@@ -22,48 +22,44 @@
 
 static const char *err_strings[] = {
 	"UFO error -o-",			/* ERR_UFOERR */
-	"Malformed Label Octet.",		/* ERR_DNSMLO */
-	"Malformed Sequence Label.",		/* ERR_DNSMSL */
-	"Malformed Dns Packet.",		/* ERR_DNSMDP */
-	"Malformed Dns Data.",			/* ERR_DNSMDD */
-	"Too many Recursive Pointers.",		/* ERR_DNSTRP */
-	"Dns Packet Len Break.",		/* ERR_DNSPLB */
-	"Pointer To Pointer error.",		/* ERR_DNSPTP */
+	"Malformed Label Octet.",	/* ERR_DNSMLO */
+	"Malformed Sequence Label.",	/* ERR_DNSMSL */
+	"Malformed Dns Packet.",	/* ERR_DNSMDP */
+	"Malformed Dns Data.",		/* ERR_DNSMDD */
+	"Too many Recursive Pointers.",	/* ERR_DNSTRP */
+	"Dns Packet Len Break.",	/* ERR_DNSPLB */
+	"Pointer To Pointer error.",	/* ERR_DNSPTP */
 	"Malformed Data.",			/* ERR_DNSMDA */
-	"Error Packing Dns Struct.",		/* ERR_DNSPDS */
-/**/	
-	"Malformed Andna Packet.",		/* ERR_ANDMAP */
-	"Andns Packet Len Break.",		/* ERR_ANDPLB */
-	"Malformed Andns Data.",		/* ERR_ANDMAD */
-	"Andna Not Compatbile Query.", 		/* ERR_ANDNCQ */
-/**/
-	"Error reading resolv.conf.",		/* ERR_RSLERC */
-	"Andns init error.",			/* ERR_RSLAIE */
-	"There isn't No NameServer.",		/* ERR_RSLNNS */
-	"Error Forwarding DNS Query.",		/* ERR_RSLFDQ */
-	"Resolution Error.",			/* ERR_RSLRSL */
-	"Andns Query Discarded.", 		/* ERR_RSLAQD */
-/**/
-	"mark_init error!.",			/* ERR_NETINI */
+	"Error Packing Dns Struct.",	/* ERR_DNSPDS */
+	 /**/ "Malformed Andna Packet.",	/* ERR_ANDMAP */
+	"Andns Packet Len Break.",	/* ERR_ANDPLB */
+	"Malformed Andns Data.",	/* ERR_ANDMAD */
+	"Andna Not Compatbile Query.",	/* ERR_ANDNCQ */
+	 /**/ "Error reading resolv.conf.",	/* ERR_RSLERC */
+	"Andns init error.",		/* ERR_RSLAIE */
+	"There isn't No NameServer.",	/* ERR_RSLNNS */
+	"Error Forwarding DNS Query.",	/* ERR_RSLFDQ */
+	"Resolution Error.",		/* ERR_RSLRSL */
+	"Andns Query Discarded.",	/* ERR_RSLAQD */
+	 /**/ "mark_init error!.",	/* ERR_NETINI */
 	"netfilter table not loadable.",	/* ERR_NETFIL */
 	"error adding netfilter rules.",	/* ERR_NETRUL */
 	"error committing netfilter rules.",	/* ERR_NETCOM */
 	"error initializing ntk_mark_chain.",	/* ERR_NETCHA */
-	"netfilter delete error.",		/* ERR_NETDEL */
-	"error storing rules.",			/* ERR_NETSTO */
-	"Nefilter was not restored.",		/* ERR_NETRST */
-/**/	
-	"SNSD main record not found.",		/* ERR_SNDMRF */
-	"SNSD recursion failed.",		/* ERR_SNDRCS */
-/**/	
-	"Zlib Compression Fail.",		/* ERR_ZLIBCP */
-	"Zlib Uncompression Fail.",		/* ERR_ZLIBUP */
-	"Zlib compression is useless.",		/* ERR_ZLIBNU */
+	"netfilter delete error.",	/* ERR_NETDEL */
+	"error storing rules.",		/* ERR_NETSTO */
+	"Nefilter was not restored.",	/* ERR_NETRST */
+	 /**/ "SNSD main record not found.",	/* ERR_SNDMRF */
+	"SNSD recursion failed.",	/* ERR_SNDRCS */
+	 /**/ "Zlib Compression Fail.",	/* ERR_ZLIBCP */
+	"Zlib Uncompression Fail.",	/* ERR_ZLIBUP */
+	"Zlib compression is useless.",	/* ERR_ZLIBNU */
 };
 
-const char *__err_strerror(int n)
+const char *
+__err_strerror(int n)
 {
-        int __n=-((n)+1);
+	int __n = -((n) + 1);
 
-	return (__n>=ERR_NERR || __n<0) ? ERR_OVERFLOW : err_strings[__n];
+	return (__n >= ERR_NERR || __n < 0) ? ERR_OVERFLOW : err_strings[__n];
 }

src/err_errno.h

@@ -1,4 +1,4 @@
-                 /**************************************
+				 /**************************************
                 *     AUTHOR: Federico Tomassini        *
                *     Copyright (C) Federico Tomassini    *
               *     Contact effetom@gmail.com             *
@@ -68,13 +68,13 @@
 #define ERR_TOTAL_ERRS	(-(ERR_ZLIBNU))
 #define ERR_OVERFLOW    "Error number does not exist."
 
-        /* END OF DEFS */
+		/* END OF DEFS */
 
 
  /*
   * Core
   */
-const char *err_func,*err_file;
+const char *err_func, *err_file;
 #define ERR_NERR                (ERR_TOTAL_ERRS)
 #define err_seterrno(n)         errno=(n);err_func=__func__;	\
                                 err_file=__FILE__
@@ -92,4 +92,4 @@ const char *err_func,*err_file;
 
 const char *__err_strerror(int n);
 
-#endif /* ERR_ERRNO_H */
+#endif							/* ERR_ERRNO_H */

src/gmap.h

@@ -19,44 +19,46 @@
 #ifndef GMAP_H
 #define GMAP_H
 
+#include "includes.h"
 #include "llist.c"
 #include "map.h"
 
 /* * * Groupnode stuff * * */
-#define GMAP_ME		MAP_ME		/*1*/
-#define GMAP_VOID	MAP_VOID	/*(1<<1)*/
+#define GMAP_ME		MAP_ME		/*1 */
+#define GMAP_VOID	MAP_VOID	/*(1<<1) */
 #define GMAP_HGNODE	(1<<2)		/*Hooked Gnode. We already hooked at 
-					  this gnode */
-#define GMAP_FULL	(1<<3)		/*The gnode is full!! aaahh, run away!*/
+								   this gnode */
+#define GMAP_FULL	(1<<3)		/*The gnode is full!! aaahh, run away! */
 
 /* This is the holy external_map. Each struct corresponds to a groupnode. 
  * This groupnode cointains MAXGROUPNODE nodes if we are at level 1 or 
  * MAXGROUPNODE groups. The map is equal to the int_map, in fact, a map_node
  * is embedded in a map_gnode. 
  * This int_map uses the QSPN_MAP_STYLEII (see qspn.h). */
-typedef struct
-{
+typedef struct {
 	/* 
 	 * The gnode_map starts here. Note that it is a normal map. (See map.h). 
 	 * It is here, at the top of the struct to allow to manipulate a map_gnode
 	 * as a map_node with the help of the magic cast. The cast is heavily 
 	 * used in qspn.c
 	 */
-	map_node	g;
-	
-	u_char 		flags;
-	u_char		seeds;	/*The number of active static nodes connected to this
-				  gnode minus one (the root_node is not counted).
-				  If seeds == MAXGROUPNODE-1, the gnode is full ^_^*/
-	u_int		gcount;	/*The total number of nodes which are inside this 
-				  gnode*/
+	map_node g;
+
+	u_char flags;
+	u_char seeds;				/*The number of active static nodes connected to this
+								   gnode minus one (the root_node is not counted).
+								   If seeds == MAXGROUPNODE-1, the gnode is full ^_^ */
+	u_int gcount;				/*The total number of nodes which are inside this 
+								   gnode */
 } map_gnode;
 
-INT_INFO map_gnode_iinfo = { 1, 
-			     { INT_TYPE_32BIT }, 
-			     { MAP_NODE_PACK_SZ+sizeof(u_char)*2 }, 
-			     { 1 }
-			   };
+INT_INFO map_gnode_iinfo = { 1,
+	{INT_TYPE_32BIT},
+	{MAP_NODE_PACK_SZ + sizeof(u_char) * 2}
+	,
+	{1}
+};
+
 #define MAP_GNODE_PACK_SZ	(MAP_NODE_PACK_SZ+sizeof(u_char)*2+sizeof(int))
 
 
@@ -125,23 +127,25 @@ INT_INFO map_gnode_iinfo = { 1,
 /* Struct used to keep all the quadro_group ids of a node. (The node is part of this
  * quadro groups) */
 typedef struct {
-	u_char      levels;		 /*How many levels we have*/
-	int         gid[MAX_LEVELS];	 /*Group ids. Each element is the gid of the quadrogroup in the 
-					   relative level. (ex: gid[n] is the gid of the quadropgroup a 
-					   the n-th level)*/
-	map_gnode  *gnode[MAX_LEVELS-ZERO_LEVEL]; /*Each element is a pointer to the relative
-						    gnode in the ext_map.*/
-	inet_prefix ipstart[MAX_LEVELS]; /*The ipstart of each quadg.gid in their respective levels*/
-}quadro_group;
+	u_char levels;				/*How many levels we have */
+	int gid[MAX_LEVELS];		/*Group ids. Each element is the gid of the quadrogroup in the 
+								   relative level. (ex: gid[n] is the gid of the quadropgroup a 
+								   the n-th level) */
+	map_gnode *gnode[MAX_LEVELS - ZERO_LEVEL];	/*Each element is a pointer to the relative
+												   gnode in the ext_map. */
+	inet_prefix ipstart[MAX_LEVELS];	/*The ipstart of each quadg.gid in their respective levels */
+} quadro_group;
 
 /* Note: this is the int_info of the a packed quadro_group struct, which
  * hasnt't the `map_gnode *gnode' pointers. The ipstart structs must be also
  * packed with pack_inet_prefix() */
-INT_INFO quadro_group_iinfo = { 1, 
-				{ INT_TYPE_32BIT },
-				{ sizeof(u_char) },
-				{ MAX_LEVELS }
-			      };
+INT_INFO quadro_group_iinfo = { 1,
+	{INT_TYPE_32BIT},
+	{sizeof(u_char)}
+	,
+	{MAX_LEVELS}
+};
+
 #define QUADRO_GROUP_PACK_SZ (sizeof(u_char) + sizeof(int)*MAX_LEVELS +     \
 				+ INET_PREFIX_PACK_SZ * MAX_LEVELS)
 
@@ -151,28 +155,28 @@ INT_INFO quadro_group_iinfo = { 1,
 #define QUADG_GNODE   (1<<2)
 
 /* This block is used to send the ext_map */
-struct ext_map_hdr
-{
-	char   quadg[QUADRO_GROUP_PACK_SZ];  /* The packed me.cur_quadg */
-
-	size_t ext_map_sz; 		/*It's the sum of all the gmaps_sz.
-					  The size of a single map is:
-					  (ext_map_sz/(MAP_GNODE_PACK_SZ*
-					  (quadg.levels-EXTRA_LEVELS)); */
-	size_t rblock_sz[MAX_LEVELS];	/*The size of the rblock of each gmap*/
-	size_t total_rblock_sz;		/*The sum of all rblock_sz*/
-}_PACKED_;
+struct ext_map_hdr {
+	char quadg[QUADRO_GROUP_PACK_SZ];	/* The packed me.cur_quadg */
+
+	size_t ext_map_sz;			/*It's the sum of all the gmaps_sz.
+								   The size of a single map is:
+								   (ext_map_sz/(MAP_GNODE_PACK_SZ*
+								   (quadg.levels-EXTRA_LEVELS)); */
+	size_t rblock_sz[MAX_LEVELS];	/*The size of the rblock of each gmap */
+	size_t total_rblock_sz;		/*The sum of all rblock_sz */
+} _PACKED_;
 
 /* Note: You have to consider the quadro_group struct when convert between
  * endianness */
-INT_INFO ext_map_hdr_iinfo = { 3, 
-			       { INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_32BIT },
-			       { QUADRO_GROUP_PACK_SZ, 
-				   QUADRO_GROUP_PACK_SZ+sizeof(size_t),
-				   QUADRO_GROUP_PACK_SZ+(sizeof(size_t)*(MAX_LEVELS+1)) },
-			       { 1, MAX_LEVELS, 1 }
-			     };
-	
+INT_INFO ext_map_hdr_iinfo = { 3,
+	{INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_32BIT},
+	{QUADRO_GROUP_PACK_SZ,
+	 QUADRO_GROUP_PACK_SZ + sizeof(size_t),
+	 QUADRO_GROUP_PACK_SZ + (sizeof(size_t) * (MAX_LEVELS + 1))}
+	,
+	{1, MAX_LEVELS, 1}
+};
+
 /* The ext_map_block is:
  * 	struct ext_map_hdr hdr;
  * 	char ext_map[ext_map_sz];
@@ -185,86 +189,101 @@ INT_INFO ext_map_hdr_iinfo = { 3,
  * doesn't belongs to our same gnode.
  */
 typedef struct {
-	map_node	node;
-	quadro_group 	quadg;	/* quadg.gnode[level] may be set to 0
-				 * if that gnode doesn't belong to the
-				 * same upper level of me.cur_quadg:
-				 * quadg.gid[level+1] != me.cur_quadg.gid[level+1]
-				 */
-}ext_rnode;
+	map_node node;
+	quadro_group quadg;			/* quadg.gnode[level] may be set to 0
+								 * if that gnode doesn't belong to the
+								 * same upper level of me.cur_quadg:
+								 * quadg.gid[level+1] != me.cur_quadg.gid[level+1]
+								 */
+} ext_rnode;
 
 /*This cache keeps the list of all the ext_rnode used.*/
 struct ext_rnode_cache {
-	LLIST_HDR	(struct ext_rnode_cache);
+	LLIST_HDR(struct ext_rnode_cache);
 
-	ext_rnode	*e;		/*The pointer to the ext_rnode struct*/
-	int		rnode_pos;	/*The ext_rnode position in the 
-					  array of rnodes of the root_node */
+	ext_rnode *e;				/*The pointer to the ext_rnode struct */
+	int rnode_pos;				/*The ext_rnode position in the 
+								   array of rnodes of the root_node */
 };
 typedef struct ext_rnode_cache ext_rnode_cache;
 
 /* * * Functions' declaration * * */
-inline int get_groups(int family, int lvl);
+int get_groups(int family, int lvl);
 int is_group_invalid(int *gids, int gid, int lvl, int family);
 
-int  pos_from_gnode(map_gnode *gnode, map_gnode *map);
-map_gnode * gnode_from_pos(int pos, map_gnode *map);
-void rnodetoip(u_int mapstart, u_int maprnode, inet_prefix ipstart, inet_prefix *ret);
-const char *rnode_to_ipstr(u_int mapstart, u_int maprnode, inet_prefix ipstart);
-int iptogid(inet_prefix *ip, int level);
-void iptogids(inet_prefix *ip, int *gid, int levels);
-void gidtoipstart(int *gid, u_char total_levels, u_char levels, int family, 
-		inet_prefix *ip);
-void iptoquadg(inet_prefix ip, map_gnode **ext_map, quadro_group *qg, char flags);
-
-void quadg_setflags(quadro_group *qg, char flags);
-void quadg_free(quadro_group *qg);
-void quadg_destroy(quadro_group *qg);
-void gnode_inc_seeds(quadro_group *qg, int level);
-void gnode_dec_seeds(quadro_group *qg, int level);
-void pack_quadro_group(quadro_group *qg, char *pack);
-void unpack_quadro_group(quadro_group *qg, char *pack);
-
-int free_gids(quadro_group *qg, int level, map_gnode **ext_map,	map_node *int_map);
-int void_gids(quadro_group *qg, int level, map_gnode **ext_map,	map_node *int_map);
-
-int random_ip(inet_prefix *ipstart, int final_level, int final_gid, 
-		int total_levels, map_gnode **ext_map, int only_free_gnode, 
-		inet_prefix *new_ip, int my_family);
-void gnodetoip(quadro_group *quadg, int gnodeid, u_char level, inet_prefix *ip);
+int pos_from_gnode(map_gnode * gnode, map_gnode * map);
+map_gnode *gnode_from_pos(int pos, map_gnode * map);
+void rnodetoip(u_int mapstart, u_int maprnode, inet_prefix ipstart,
+			   inet_prefix * ret);
+const char *rnode_to_ipstr(u_int mapstart, u_int maprnode,
+						   inet_prefix ipstart);
+int iptogid(inet_prefix * ip, int level);
+void iptogids(inet_prefix * ip, int *gid, int levels);
+void gidtoipstart(int *gid, u_char total_levels, u_char levels, int family,
+				  inet_prefix * ip);
+void iptoquadg(inet_prefix ip, map_gnode ** ext_map, quadro_group * qg,
+			   char flags);
+
+void quadg_setflags(quadro_group * qg, char flags);
+void quadg_free(quadro_group * qg);
+void quadg_destroy(quadro_group * qg);
+void gnode_inc_seeds(quadro_group * qg, int level);
+void gnode_dec_seeds(quadro_group * qg, int level);
+void pack_quadro_group(quadro_group * qg, char *pack);
+void unpack_quadro_group(quadro_group * qg, char *pack);
+
+int free_gids(quadro_group * qg, int level, map_gnode ** ext_map,
+			  map_node * int_map);
+int void_gids(quadro_group * qg, int level, map_gnode ** ext_map,
+			  map_node * int_map);
+
+int random_ip(inet_prefix * ipstart, int final_level, int final_gid,
+			  int total_levels, map_gnode ** ext_map, int only_free_gnode,
+			  inet_prefix * new_ip, int my_family);
+void gnodetoip(quadro_group * quadg, int gnodeid, u_char level,
+			   inet_prefix * ip);
 int gids_cmp(int *gids_a, int *gids_b, int lvl, int max_lvl);
 int quadg_gids_cmp(quadro_group a, quadro_group b, int lvl);
 int ip_gids_cmp(inet_prefix a, inet_prefix b, int lvl);
-ext_rnode_cache *erc_find(ext_rnode_cache *erc, ext_rnode *e_rnode);
-void e_rnode_del(ext_rnode_cache **erc_head, u_int *counter, ext_rnode_cache *erc);
-void e_rnode_add(ext_rnode_cache **erc, ext_rnode *e_rnode, int rnode_pos, u_int *counter);
-ext_rnode_cache *e_rnode_init(u_int *counter);
-void e_rnode_free(ext_rnode_cache **erc, u_int *counter);
-ext_rnode_cache *e_rnode_find(ext_rnode_cache *erc, quadro_group *qg, int level);
-void erc_update_rnodepos(ext_rnode_cache *erc, map_node *root_node, int old_rnode_pos);
-void erc_reorder_rnodepos(ext_rnode_cache **erc, u_int *erc_counter, map_node *root_node);
-ext_rnode_cache *erc_find_gnode(ext_rnode_cache *erc, map_gnode *gnode, u_char level);
+ext_rnode_cache *erc_find(ext_rnode_cache * erc, ext_rnode * e_rnode);
+void e_rnode_del(ext_rnode_cache ** erc_head, u_int * counter,
+				 ext_rnode_cache * erc);
+void e_rnode_add(ext_rnode_cache ** erc, ext_rnode * e_rnode,
+				 int rnode_pos, u_int * counter);
+ext_rnode_cache *e_rnode_init(u_int * counter);
+void e_rnode_free(ext_rnode_cache ** erc, u_int * counter);
+ext_rnode_cache *e_rnode_find(ext_rnode_cache * erc, quadro_group * qg,
+							  int level);
+void erc_update_rnodepos(ext_rnode_cache * erc, map_node * root_node,
+						 int old_rnode_pos);
+void erc_reorder_rnodepos(ext_rnode_cache ** erc, u_int * erc_counter,
+						  map_node * root_node);
+ext_rnode_cache *erc_find_gnode(ext_rnode_cache * erc, map_gnode * gnode,
+								u_char level);
 
 map_gnode *init_gmap(int groups);
-void reset_gmap(map_gnode *gmap, int groups);
+void reset_gmap(map_gnode * gmap, int groups);
 map_gnode **init_extmap(u_char levels, int groups);
-void free_extmap(map_gnode **ext_map, u_char levels, int groups);
-void reset_extmap(map_gnode **ext_map, u_char levels, int groups);
-
-int  g_rnode_find(map_gnode *gnode, map_gnode *n);
-int  extmap_find_level(map_gnode **ext_map, map_gnode *gnode, u_char max_level);
-void gmap_node_del(map_gnode *gnode);
-
-int merge_ext_maps(map_gnode **base, map_gnode **new, quadro_group base_root,
-		quadro_group new_root);
-
-int verify_ext_map_hdr(struct ext_map_hdr *emap_hdr, quadro_group *quadg);
-void free_extmap_rblock(map_rnode **rblock, u_char levels);
-void pack_map_gnode(map_gnode *gnode, char *pack);
-void unpack_map_gnode(map_gnode *gnode, char *pack);
-char *pack_extmap(map_gnode **ext_map, int maxgroupnode, quadro_group *quadg, size_t *pack_sz);
-map_gnode **unpack_extmap(char *package, quadro_group *quadg);
-int save_extmap(map_gnode **ext_map, int maxgroupnode, quadro_group *quadg, char *file);
-map_gnode **load_extmap(char *file, quadro_group *quadg);
-
-#endif /*GMAP_H*/
+void free_extmap(map_gnode ** ext_map, u_char levels, int groups);
+void reset_extmap(map_gnode ** ext_map, u_char levels, int groups);
+
+int g_rnode_find(map_gnode * gnode, map_gnode * n);
+int extmap_find_level(map_gnode ** ext_map, map_gnode * gnode,
+					  u_char max_level);
+void gmap_node_del(map_gnode * gnode);
+
+int merge_ext_maps(map_gnode ** base, map_gnode ** new,
+				   quadro_group base_root, quadro_group new_root);
+
+int verify_ext_map_hdr(struct ext_map_hdr *emap_hdr, quadro_group * quadg);
+void free_extmap_rblock(map_rnode ** rblock, u_char levels);
+void pack_map_gnode(map_gnode * gnode, char *pack);
+void unpack_map_gnode(map_gnode * gnode, char *pack);
+char *pack_extmap(map_gnode ** ext_map, int maxgroupnode,
+				  quadro_group * quadg, size_t * pack_sz);
+map_gnode **unpack_extmap(char *package, quadro_group * quadg);
+int save_extmap(map_gnode ** ext_map, int maxgroupnode,
+				quadro_group * quadg, char *file);
+map_gnode **load_extmap(char *file, quadro_group * quadg);
+
+#endif							/*GMAP_H */

src/hash.c

@@ -23,7 +23,8 @@
 #include "hash.h"
 
 /* Robert Jenkins's 32 bit Mix Function */
-unsigned int inthash(unsigned int key)
+unsigned int
+inthash(unsigned int key)
 {
 	key += (key << 12);
 	key ^= (key >> 22);
@@ -70,25 +71,28 @@ unsigned int inthash(unsigned int key)
  * returns:
  *	32 bit hash as a static hash type
  */
-u_long fnv_32_buf(void *buf, size_t len, u_long hval)
+u_long
+fnv_32_buf(void *buf, size_t len, u_long hval)
 {
-    u_char *bp = (u_char *)buf;	/* start of buffer */
-    u_char *be = bp + len;		/* beyond end of buffer */
+	u_char *bp = (u_char *) buf;	/* start of buffer */
+	u_char *be = bp + len;		/* beyond end of buffer */
 
-    /*
-     * FNV-1 hash each octet in the buffer
-     */
-    while (bp < be) {
+	/*
+	 * FNV-1 hash each octet in the buffer
+	 */
+	while (bp < be) {
 
-	/* multiply by the 32 bit FNV magic prime mod 2^32 */
-	hval += (hval<<1) + (hval<<4) + (hval<<7) + (hval<<8) + (hval<<24);
+		/* multiply by the 32 bit FNV magic prime mod 2^32 */
+		hval +=
+			(hval << 1) + (hval << 4) + (hval << 7) + (hval << 8) +
+			(hval << 24);
 
-	/* xor the bottom with the current octet */
-	hval ^= (u_long)*bp++;
-    }
+		/* xor the bottom with the current octet */
+		hval ^= (u_long) * bp++;
+	}
 
-    /* return our new hash value */
-    return hval;
+	/* return our new hash value */
+	return hval;
 }
 
 
@@ -98,44 +102,45 @@ u_long fnv_32_buf(void *buf, size_t len, u_long hval)
  * first five operations no overflow is possible so we optimized it a
  * bit.  
  */
-inline unsigned int dl_elf_hash (const unsigned char *name)
+unsigned int
+dl_elf_hash(const unsigned char *name)
 {
-  unsigned long int hash = 0;
-  if (*name != '\0') {
-      hash = *name++;
-      if (*name != '\0') {
-	  hash = (hash << 4) + *name++;
-	  if (*name != '\0') {
-	      hash = (hash << 4) + *name++;
-	      if (*name != '\0') {
-		  hash = (hash << 4) + *name++;
-		  if (*name != '\0') {
-		      hash = (hash << 4) + *name++;
-		      while (*name != '\0') {
-			  unsigned long int hi;
-			  hash = (hash << 4) + *name++;
-			  hi = hash & 0xf0000000;
-
-			  /* The algorithm specified in the ELF ABI is as
-			     follows:
-
-			     if (hi != 0)
-			       hash ^= hi >> 24;
-
-			     hash &= ~hi;
-
-			     But the following is equivalent and a lot
-			     faster, especially on modern processors.  */
-
-			  hash ^= hi;
-			  hash ^= hi >> 24;
+	unsigned long int hash = 0;
+	if (*name != '\0') {
+		hash = *name++;
+		if (*name != '\0') {
+			hash = (hash << 4) + *name++;
+			if (*name != '\0') {
+				hash = (hash << 4) + *name++;
+				if (*name != '\0') {
+					hash = (hash << 4) + *name++;
+					if (*name != '\0') {
+						hash = (hash << 4) + *name++;
+						while (*name != '\0') {
+							unsigned long int hi;
+							hash = (hash << 4) + *name++;
+							hi = hash & 0xf0000000;
+
+							/* The algorithm specified in the ELF ABI is as
+							   follows:
+
+							   if (hi != 0)
+							   hash ^= hi >> 24;
+
+							   hash &= ~hi;
+
+							   But the following is equivalent and a lot
+							   faster, especially on modern processors.  */
+
+							hash ^= hi;
+							hash ^= hi >> 24;
+						}
+					}
+				}
 			}
-		    }
 		}
-	    }
 	}
-    }
-  return hash;
+	return hash;
 }
 
 /* 
@@ -145,22 +150,23 @@ inline unsigned int dl_elf_hash (const unsigned char *name)
  * If h_sec or h_usec are not null, it stores in them respectively the hash of
  * the second and the microsecond.
  */
-int hash_time(int *h_sec, int *h_usec)
+int
+hash_time(int *h_sec, int *h_usec)
 {
 	struct timeval t;
-	char str[sizeof(struct timeval)+1];
+	char str[sizeof(struct timeval) + 1];
 	u_int elf_hash;
-	
+
 	gettimeofday(&t, 0);
 	memcpy(str, &t, sizeof(struct timeval));
-	str[sizeof(struct timeval)]=0;
-
-	elf_hash=dl_elf_hash((u_char *)str);
-	
-	if(h_sec)
-		*h_sec=inthash(t.tv_sec);
-	if(h_usec)
-		*h_usec=inthash(t.tv_usec);
+	str[sizeof(struct timeval)] = 0;
+
+	elf_hash = dl_elf_hash((u_char *) str);
+
+	if (h_sec)
+		*h_sec = inthash(t.tv_sec);
+	if (h_usec)
+		*h_usec = inthash(t.tv_usec);
 
 	return inthash(elf_hash);
 }

src/hash.h

@@ -27,8 +27,8 @@
 \*/
 u_long fnv_32_buf(void *buf, size_t len, u_long hval);
 unsigned int inthash(unsigned int key);
-inline unsigned int dl_elf_hash (const unsigned char *name);
+unsigned int dl_elf_hash(const unsigned char *name);
 char xor_int(int i);
 int hash_time(int *h_sec, int *h_usec);
 
-#endif /*HASH_H*/
+#endif							/*HASH_H */

src/hook.h

@@ -21,9 +21,9 @@
 
 #include "qspn.h"
 
-#define MAX_FIRST_RADAR_SCANS	1  /* How many time we have to retry 
-				      the first radar_scan if we
-				      didn't found anything */
+#define MAX_FIRST_RADAR_SCANS	1	/* How many time we have to retry 
+									   the first radar_scan if we
+									   didn't found anything */
 #ifdef DEBUG
 #undef  MAX_FIRST_RADAR_SCANS
 #define MAX_FIRST_RADAR_SCANS	1
@@ -34,7 +34,7 @@
 #define HOOKING_IP_172		0xac100001	/* 172.16.0.1 */
 #define HOOKING_IPV6		0xfec00000	/* fec0:: */
 
-#define HOOK_RQ_TIMEOUT		8  /* seconds */
+#define HOOK_RQ_TIMEOUT		8	/* seconds */
 
 /*
  * * *  Global vars  * * *
@@ -45,7 +45,7 @@ int total_hooks;
 
 /* Current join_rate */
 u_int hook_join_rate;
-u_int rnodes_rehooked;		/* How many rnodes have rehooked with us */
+u_int rnodes_rehooked;			/* How many rnodes have rehooked with us */
 
 
 /*
@@ -62,20 +62,21 @@ u_int rnodes_rehooked;		/* How many rnodes have rehooked with us */
  * the gnode with `fn_hdr.gid' gid of the `fn_hdr.level'th level. So the free gnodes
  * are part of the (fn_hdr.level - 1)th level.
  */
-struct free_nodes_hdr
-{
-	u_char 		max_levels;	/* How many levels we are managing */
-
-	uint32_t 	ipstart[MAX_IP_INT];	 /* The ipstart of the gnode */
-	u_char 		level;		/* The level where the gnode belongs */
-	u_char  	gid;		/* The gnode id */
-	u_char		nodes;		/* The number of free (g)nodes - 1 */
-	uint32_t	join_rate;	/* Join_rate of `level' */
-}_PACKED_;
-INT_INFO free_nodes_hdr_iinfo = { 1, { INT_TYPE_32BIT }, 
-				     { sizeof(struct free_nodes_hdr)-sizeof(uint32_t) },
-				     { 1 }
-				};
+struct free_nodes_hdr {
+	u_char max_levels;			/* How many levels we are managing */
+
+	uint32_t ipstart[MAX_IP_INT];	/* The ipstart of the gnode */
+	u_char level;				/* The level where the gnode belongs */
+	u_char gid;					/* The gnode id */
+	u_char nodes;				/* The number of free (g)nodes - 1 */
+	uint32_t join_rate;			/* Join_rate of `level' */
+} _PACKED_;
+INT_INFO free_nodes_hdr_iinfo = { 1, {INT_TYPE_32BIT},
+{sizeof(struct free_nodes_hdr) - sizeof(uint32_t)}
+,
+{1}
+};
+
 #define FREE_NODES_SZ(nodes) (sizeof(struct free_nodes_hdr)  	      +\
 					    (sizeof(u_char) * (nodes)))
 
@@ -105,12 +106,13 @@ INT_INFO free_nodes_hdr_iinfo = { 1, { INT_TYPE_32BIT },
  */
 /* Note: for this int_info we are considering the timeval array as one int
  * with `max_levels'*2 members */
-INT_INFO qspn_round_pkt_iinfo = { 3, 
-				  { INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_32BIT }, 
-				  { sizeof(char), IINFO_DYNAMIC_VALUE, IINFO_DYNAMIC_VALUE },
-				  { IINFO_DYNAMIC_VALUE, IINFO_DYNAMIC_VALUE, GCOUNT_LEVELS }
-				};
-	
+INT_INFO qspn_round_pkt_iinfo = { 3,
+	{INT_TYPE_32BIT, INT_TYPE_32BIT, INT_TYPE_32BIT}
+	,
+	{sizeof(char), IINFO_DYNAMIC_VALUE, IINFO_DYNAMIC_VALUE},
+	{IINFO_DYNAMIC_VALUE, IINFO_DYNAMIC_VALUE, GCOUNT_LEVELS}
+};
+
 #define QSPN_ROUND_PKT_SZ(levels)	(sizeof(u_char) + 			\
 					    ((levels) * sizeof(int32_t)) +	\
 			                    ((levels) * sizeof(struct timeval))+\
@@ -120,17 +122,17 @@ INT_INFO qspn_round_pkt_iinfo = { 3,
 /* 
  * * * Functions declaration * * *
  */
-	
+
 int put_free_nodes(PACKET rq_pkt);
 int put_qspn_round(PACKET rq_pkt);
 int put_ext_map(PACKET rq_pkt);
 int put_int_map(PACKET rq_pkt);
 int put_bnode_map(PACKET rq_pkt);
 
-int create_gnodes(inet_prefix *ip, int final_level);
+int create_gnodes(inet_prefix * ip, int final_level);
 void set_ip_and_def_gw(char *dev, inet_prefix ip);
 
 int hook_init(void);
-int netsukuku_hook(map_gnode *hook_gnode, int hook_level);
+int netsukuku_hook(map_gnode * hook_gnode, int hook_level);
 
-#endif /*HOOK_H*/
+#endif							/*HOOK_H */

src/if.c

@@ -28,22 +28,21 @@
 
 extern int errno;
 
-static struct
-{       
-        int ifindex;
-        int family;
-        int oneline;
-        int showqueue;
-        inet_prefix pfx;
-        int scope, scopemask;
-        int flags, flagmask;
-        int up;
-        char *label;
-        int flushed;
-        char *flushb;
-        int flushp;
-        int flushe; 
-        struct rtnl_handle *rth;
+static struct {
+	int ifindex;
+	int family;
+	int oneline;
+	int showqueue;
+	inet_prefix pfx;
+	int scope, scopemask;
+	int flags, flagmask;
+	int up;
+	char *label;
+	int flushed;
+	char *flushb;
+	int flushp;
+	int flushe;
+	struct rtnl_handle *rth;
 } filter;
 
 /*
@@ -51,26 +50,28 @@ static struct
  * device which has the index equal to `dev_idx'.
  * `ifs' is the array which keeps the interface list and has `ifs_n' elements.
  */
-interface *ifs_find_idx(interface *ifs, int ifs_n, int dev_idx)
+interface *
+ifs_find_idx(interface * ifs, int ifs_n, int dev_idx)
 {
 	int i;
 
-	for(i=0; i<ifs_n; i++)
-		if(ifs[i].dev_idx == dev_idx)
+	for (i = 0; i < ifs_n; i++)
+		if (ifs[i].dev_idx == dev_idx)
 			return &ifs[i];
 
 	return 0;
 }
 
-int ifs_find_devname(interface *ifs, int ifs_n, char *dev_name)
+int
+ifs_find_devname(interface * ifs, int ifs_n, char *dev_name)
 {
 	int i;
 
-	if(!dev_name)
+	if (!dev_name)
 		return -1;
 
-	for(i=0; i<ifs_n; i++)
-		if(ifs[i].dev_name && 
+	for (i = 0; i < ifs_n; i++)
+		if (ifs[i].dev_name &&
 			!strncmp(ifs[i].dev_name, dev_name, IFNAMSIZ))
 			return i;
 
@@ -81,13 +82,14 @@ int ifs_find_devname(interface *ifs, int ifs_n, char *dev_name)
  * ifs_del: removes from the `ifs' array the device which is at the
  * `if_pos'th position. `*ifs_n' is then decremented.
  */
-void ifs_del(interface *ifs, int *ifs_n, int if_pos)
+void
+ifs_del(interface * ifs, int *ifs_n, int if_pos)
 {
-	if(if_pos == (*ifs_n)-1)
+	if (if_pos == (*ifs_n) - 1)
 		setzero(&ifs[if_pos], sizeof(interface));
 	else {
-		memcpy(&ifs[if_pos], &ifs[(*ifs_n)-1], sizeof(interface));
-		setzero(&ifs[(*ifs_n)-1], sizeof(interface));
+		memcpy(&ifs[if_pos], &ifs[(*ifs_n) - 1], sizeof(interface));
+		setzero(&ifs[(*ifs_n) - 1], sizeof(interface));
 	}
 
 	(*ifs_n)--;
@@ -97,12 +99,13 @@ void ifs_del(interface *ifs, int *ifs_n, int if_pos)
  * ifs_del_byname: deletes from the `ifs' array the device whose name is equal
  * to `dev_name'
  */
-void ifs_del_byname(interface *ifs, int *ifs_n, char *dev_name)
+void
+ifs_del_byname(interface * ifs, int *ifs_n, char *dev_name)
 {
 	int if_pos;
 
-	if_pos=ifs_find_devname(ifs, *ifs_n, dev_name);
-	if(if_pos < 0)
+	if_pos = ifs_find_devname(ifs, *ifs_n, dev_name);
+	if (if_pos < 0)
 		return;
 
 	ifs_del(ifs, ifs_n, if_pos);
@@ -113,20 +116,21 @@ void ifs_del_byname(interface *ifs, int *ifs_n, char *dev_name)
  * device name that begins with `dev_name'. For example, 
  * ifs_del_all_name(ifs, ifs_n, "tun") deletes all the tunnel iifs
  */
-void ifs_del_all_name(interface *ifs, int *ifs_n, char *dev_name)
+void
+ifs_del_all_name(interface * ifs, int *ifs_n, char *dev_name)
 {
 	int i, dev_len;
 
-	if(!dev_name || (dev_len=strlen(dev_name)) > IFNAMSIZ)
+	if (!dev_name || (dev_len = strlen(dev_name)) > IFNAMSIZ)
 		return;
-	
-	for(i=0; i<(*ifs_n); i++) {
-		if(ifs[i].dev_name && 
+
+	for (i = 0; i < (*ifs_n); i++) {
+		if (ifs[i].dev_name &&
 			!strncmp(ifs[i].dev_name, dev_name, dev_len)) {
 
-				ifs_del(ifs, ifs_n, i);
-				if(i <= (*ifs_n)-1)
-					i--;
+			ifs_del(ifs, ifs_n, i);
+			if (i <= (*ifs_n) - 1)
+				i--;
 		}
 	}
 }
@@ -137,12 +141,13 @@ void ifs_del_all_name(interface *ifs, int *ifs_n, char *dev_name)
  * `dev'->dev_idx. The `ifs' array has `ifs_n' members.
  * If it is not found -1 is returned.
  */
-int ifs_get_pos(interface *ifs, int ifs_n, interface *dev)
+int
+ifs_get_pos(interface * ifs, int ifs_n, interface * dev)
 {
 	int i;
 
-	for(i=0; i<ifs_n; i++)
-		if(ifs[i].dev_idx == dev->dev_idx)
+	for (i = 0; i < ifs_n; i++)
+		if (ifs[i].dev_idx == dev->dev_idx)
 			return i;
 
 	return -1;
@@ -152,17 +157,18 @@ int ifs_get_pos(interface *ifs, int ifs_n, interface *dev)
  * get_dev: It returs the first dev it finds up and sets `*dev_ids' to the
  * device's index. On error NULL is returned.
  */
-const char *get_dev(int *dev_idx) 
+const char *
+get_dev(int *dev_idx)
 {
 	int idx;
 
-	if((idx=ll_first_up_if()) == -1) {
+	if ((idx = ll_first_up_if()) == -1) {
 		error("Couldn't find \"up\" devices. Set one dev \"up\", or "
-				"specify the device name in the options.");
+			  "specify the device name in the options.");
 		return 0;
 	}
-	if(dev_idx)
-		*dev_idx=idx;
+	if (dev_idx)
+		*dev_idx = idx;
 	return ll_index_to_name(idx);
 }
 
@@ -171,48 +177,52 @@ const char *get_dev(int *dev_idx)
  * finds up. The `ifs' array has `ifs_n'# members.
  * It returns the number of filled interfaces.
  */
-int get_all_up_ifs(interface *ifs, int ifs_n)
+int
+get_all_up_ifs(interface * ifs, int ifs_n)
 {
 	int i, idx, n;
 
-	for(i=0, n=0; i<ifs_n; i++) {
-		idx=ll_nth_up_if(n+1);
-		if(idx <= 0)
+	for (i = 0, n = 0; i < ifs_n; i++) {
+		idx = ll_nth_up_if(n + 1);
+		if (idx <= 0)
 			continue;
-		
-		ifs[n].dev_idx=idx;
-	        strncpy(ifs[n].dev_name, ll_index_to_name(idx), IFNAMSIZ);
+
+		ifs[n].dev_idx = idx;
+		strncpy(ifs[n].dev_name, ll_index_to_name(idx), IFNAMSIZ);
 		loginfo("Network interface \"%s\" detected", ifs[n].dev_name);
 		n++;
 
-		if((idx-1) > i)
-			i=idx-1;
+		if ((idx - 1) > i)
+			i = idx - 1;
 	}
-	
+
 	return n;
 }
 
-int set_flags(char *dev, u_int flags, u_int mask)
+int
+set_flags(char *dev, u_int flags, u_int mask)
 {
 	struct ifreq ifr;
 	int s;
 
 	strcpy(ifr.ifr_name, dev);
-	if((s=new_socket(AF_INET)) < 0) {
+	if ((s = new_socket(AF_INET)) < 0) {
 		error("Error while setting \"%s\" flags: Cannot open socket", dev);
 		return -1;
 	}
 
-	if(ioctl(s, SIOCGIFFLAGS, &ifr)) {
-		error("Error while setting \"%s\" flags: %s", dev, strerror(errno));
+	if (ioctl(s, SIOCGIFFLAGS, &ifr)) {
+		error("Error while setting \"%s\" flags: %s", dev,
+			  strerror(errno));
 		close(s);
 		return -1;
 	}
 
 	ifr.ifr_flags &= ~mask;
-	ifr.ifr_flags |= mask&flags;
-	if(ioctl(s, SIOCSIFFLAGS, &ifr)) {
-		error("Error while setting \"%s\" flags: %s", dev, strerror(errno));
+	ifr.ifr_flags |= mask & flags;
+	if (ioctl(s, SIOCSIFFLAGS, &ifr)) {
+		error("Error while setting \"%s\" flags: %s", dev,
+			  strerror(errno));
 		close(s);
 		return -1;
 	}
@@ -220,19 +230,21 @@ int set_flags(char *dev, u_int flags, u_int mask)
 	return 0;
 }
 
-int set_dev_up(char *dev)
+int
+set_dev_up(char *dev)
 {
-	u_int mask=0, flags=0;
-	
+	u_int mask = 0, flags = 0;
+
 	mask |= IFF_UP;
 	flags |= IFF_UP;
 	return set_flags(dev, flags, mask);
 }
 
-int set_dev_down(char *dev)
+int
+set_dev_down(char *dev)
 {
-	u_int mask=0, flags=0;
-	
+	u_int mask = 0, flags = 0;
+
 	mask |= IFF_UP;
 	flags &= ~IFF_UP;
 	return set_flags(dev, flags, mask);
@@ -245,12 +257,13 @@ int set_dev_down(char *dev)
  * It returns the sum of all each return code, of set_func, therefore if it
  * returns a negative value, some `set_func' gave an error.
  */
-int set_all_ifs(interface *ifs, int ifs_n, int (*set_func)(char *dev))
+int
+set_all_ifs(interface * ifs, int ifs_n, int (*set_func) (char *dev))
 {
-	int i, ret=0;
+	int i, ret = 0;
 
-	for(i=0; i<ifs_n; i++)
-		ret+=set_func(ifs[i].dev_name);
+	for (i = 0; i < ifs_n; i++)
+		ret += set_func(ifs[i].dev_name);
 
 	return ret;
 }
@@ -264,47 +277,48 @@ int set_all_ifs(interface *ifs, int ifs_n, int (*set_func)(char *dev))
  * stores all the initialized interfaces, updating the `new_ifs_n' counter.
  * On error -1 is returned.
  */
-int if_init_all(char *ifs_name[MAX_INTERFACES], int ifs_n, 
-		interface *new_ifs, int *new_ifs_n)
+int
+if_init_all(char *ifs_name[MAX_INTERFACES], int ifs_n,
+			interface * new_ifs, int *new_ifs_n)
 {
 	struct rtnl_handle rth;
-	int ret=0, i, n;
+	int ret = 0, i, n;
 
 	if (rtnl_open(&rth, 0) < 0) {
 		error("Cannot open the rtnetlink socket to talk to the kernel's "
-				"soul");
+			  "soul");
 		return -1;
 	}
 	ll_init_map(&rth);
 
-	if(!ifs_n) {
-		ret=get_all_up_ifs(new_ifs, MAX_INTERFACES);
+	if (!ifs_n) {
+		ret = get_all_up_ifs(new_ifs, MAX_INTERFACES);
 
-		if(!ret)
+		if (!ret)
 			return -1;
 
-		*new_ifs_n=ret;
+		*new_ifs_n = ret;
 	} else {
-		for(i=0, n=0; i<ifs_n; i++) {
-			
-			new_ifs[n].dev_idx=ll_name_to_index(ifs_name[n]);
-			if(!new_ifs[n].dev_idx) {
+		for (i = 0, n = 0; i < ifs_n; i++) {
+
+			new_ifs[n].dev_idx = ll_name_to_index(ifs_name[n]);
+			if (!new_ifs[n].dev_idx) {
 				error("Cannot initialize the %s interface. "
-						"Ignoring it", ifs_name[n]);
+					  "Ignoring it", ifs_name[n]);
 				continue;
 			}
 
 			strncpy(new_ifs[n].dev_name, ifs_name[n], IFNAMSIZ);
 			n++;
 		}
-		
-		if(!n)
+
+		if (!n)
 			return -1;
-			
-		*new_ifs_n=n;
+
+		*new_ifs_n = n;
 	}
 
-	if(set_all_ifs(new_ifs, *new_ifs_n, set_dev_up) < 0)
+	if (set_all_ifs(new_ifs, *new_ifs_n, set_dev_up) < 0)
 		return -1;
 
 	rtnl_close(&rth);
@@ -312,7 +326,8 @@ int if_init_all(char *ifs_name[MAX_INTERFACES], int ifs_n,
 	return ret;
 }
 
-void if_close_all(void)
+void
+if_close_all(void)
 {
 #if 0
 	/* XXX: disabled for now, it is buggy */
@@ -324,43 +339,48 @@ void if_close_all(void)
  * set_dev_ip: Assign the given `ip' to the interface named `dev'
  * On success 0 is returned, -1 otherwise.
  */
-int set_dev_ip(inet_prefix ip, char *dev)
+int
+set_dev_ip(inet_prefix ip, char *dev)
 {
-	int s=-1;
+	int s = -1;
 
-	if(ip.family == AF_INET) {
+	if (ip.family == AF_INET) {
 		struct ifreq req;
 
-		if((s=new_socket(AF_INET)) < 0) {
-			error("Error while setting \"%s\" ip: Cannot open socket", dev);
+		if ((s = new_socket(AF_INET)) < 0) {
+			error("Error while setting \"%s\" ip: Cannot open socket",
+				  dev);
 			return -1;
 		}
 
 		strncpy(req.ifr_name, dev, IFNAMSIZ);
 		inet_to_sockaddr(&ip, 0, &req.ifr_addr, 0);
 
-		if(ioctl(s, SIOCSIFADDR, &req)) {
-			error("Error while setting \"%s\" ip: %s", dev, strerror(errno));
+		if (ioctl(s, SIOCSIFADDR, &req)) {
+			error("Error while setting \"%s\" ip: %s", dev,
+				  strerror(errno));
 			close(s);
 			return -1;
 		}
-	} else if(ip.family == AF_INET6) {
+	} else if (ip.family == AF_INET6) {
 		struct in6_ifreq req6;
 		struct sockaddr_in6 sin6;
-		struct sockaddr *sa=(struct sockaddr *)&sin6;
+		struct sockaddr *sa = (struct sockaddr *) &sin6;
 
-		if((s=new_socket(AF_INET6)) < 0) {
-			error("Error while setting \"%s\" ip: Cannot open socket", dev);
+		if ((s = new_socket(AF_INET6)) < 0) {
+			error("Error while setting \"%s\" ip: Cannot open socket",
+				  dev);
 			return -1;
 		}
-		
-		req6.ifr6_ifindex=ll_name_to_index(dev);
-		req6.ifr6_prefixlen=0;
+
+		req6.ifr6_ifindex = ll_name_to_index(dev);
+		req6.ifr6_prefixlen = 0;
 		inet_to_sockaddr(&ip, 0, sa, 0);
 		memcpy(&req6.ifr6_addr, sin6.sin6_addr.s6_addr32, ip.len);
 
-		if(ioctl(s, SIOCSIFADDR, &req6)) {
-			error("Error while setting \"%s\" ip: %s", dev, strerror(errno));
+		if (ioctl(s, SIOCSIFADDR, &req6)) {
+			error("Error while setting \"%s\" ip: %s", dev,
+				  strerror(errno));
 			close(s);
 			return -1;
 		}
@@ -376,12 +396,13 @@ int set_dev_ip(inet_prefix ip, char *dev)
  * present in the `ifs' array.
  * On error -1 is returned.
  */
-int set_all_dev_ip(inet_prefix ip, interface *ifs, int ifs_n)
+int
+set_all_dev_ip(inet_prefix ip, interface * ifs, int ifs_n)
 {
-	int i, ret=0;
-	
-	for(i=0; i<ifs_n; i++)
-		ret+=set_dev_ip(ip, ifs[i].dev_name);
+	int i, ret = 0;
+
+	for (i = 0; i < ifs_n; i++)
+		ret += set_dev_ip(ip, ifs[i].dev_name);
 
 	return ret;
 }
@@ -391,46 +412,47 @@ int set_all_dev_ip(inet_prefix ip, interface *ifs, int ifs_n)
  * and stores it to `ip'.
  * On success 0 is returned, -1 otherwise.
  */
-int get_dev_ip(inet_prefix *ip, int family, char *dev)
+int
+get_dev_ip(inet_prefix * ip, int family, char *dev)
 {
-	int s=-1;
-	int ret=0;
+	int s = -1;
+	int ret = 0;
 
 	setzero(ip, sizeof(inet_prefix));
 
-	if((s=new_socket(family)) < 0) {
+	if ((s = new_socket(family)) < 0) {
 		error("Error while setting \"%s\" ip: Cannot open socket", dev);
 		return -1;
 	}
 
-	if(family == AF_INET) {
+	if (family == AF_INET) {
 		struct ifreq req;
 
 		strncpy(req.ifr_name, dev, IFNAMSIZ);
 		req.ifr_addr.sa_family = family;
-		
-		if(ioctl(s, SIOCGIFADDR, &req))
+
+		if (ioctl(s, SIOCGIFADDR, &req))
 			ERROR_FINISH(ret, -1, finish);
 
 		sockaddr_to_inet(&req.ifr_addr, ip, 0);
-	} else if(family == AF_INET6) {
+	} else if (family == AF_INET6) {
 		struct in6_ifreq req6;
 
 		/*
 		 * XXX: NOT TESTED
 		 */
 
-		req6.ifr6_ifindex=ll_name_to_index(dev);
-		req6.ifr6_prefixlen=0;
+		req6.ifr6_ifindex = ll_name_to_index(dev);
+		req6.ifr6_prefixlen = 0;
 
-		if(ioctl(s, SIOCGIFADDR, &req6))
+		if (ioctl(s, SIOCGIFADDR, &req6))
 			ERROR_FINISH(ret, -1, finish);
 
-		inet_setip(ip, (u_int *)&req6.ifr6_addr, family);
+		inet_setip(ip, (u_int *) & req6.ifr6_addr, family);
 	}
 
-finish:
-	if(s != -1)
+  finish:
+	if (s != -1)
 		close(s);
 	return ret;
 }
@@ -442,22 +464,24 @@ finish:
  *
  * Modified lightly
  */
-static int flush_update(void)
-{                       
-        if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
-                error("Failed to send flush request: %s", strerror(errno));
-                return -1;
-        }               
-        filter.flushp = 0;
-        return 0;
+static int
+flush_update(void)
+{
+	if (rtnl_send(filter.rth, filter.flushb, filter.flushp) < 0) {
+		error("Failed to send flush request: %s", strerror(errno));
+		return -1;
+	}
+	filter.flushp = 0;
+	return 0;
 }
 
-int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n, 
-		   void *arg)
+int
+print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
+			   void *arg)
 {
 	struct ifaddrmsg *ifa = NLMSG_DATA(n);
 	int len = n->nlmsg_len;
-	struct rtattr * rta_tb[IFA_MAX+1];
+	struct rtattr *rta_tb[IFA_MAX + 1];
 	char b1[64];
 
 	if (n->nlmsg_type != RTM_NEWADDR && n->nlmsg_type != RTM_DELADDR)
@@ -471,7 +495,8 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 	if (filter.flushb && n->nlmsg_type != RTM_NEWADDR)
 		return 0;
 
-	parse_rtattr(rta_tb, IFA_MAX, IFA_RTA(ifa), n->nlmsg_len - NLMSG_LENGTH(sizeof(*ifa)));
+	parse_rtattr(rta_tb, IFA_MAX, IFA_RTA(ifa),
+				 n->nlmsg_len - NLMSG_LENGTH(sizeof(*ifa)));
 
 	if (!rta_tb[IFA_LOCAL])
 		rta_tb[IFA_LOCAL] = rta_tb[IFA_ADDRESS];
@@ -480,9 +505,9 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 
 	if (filter.ifindex && filter.ifindex != ifa->ifa_index)
 		return 0;
-	if ((filter.scope^ifa->ifa_scope)&filter.scopemask)
+	if ((filter.scope ^ ifa->ifa_scope) & filter.scopemask)
 		return 0;
-	if ((filter.flags^ifa->ifa_flags)&filter.flagmask)
+	if ((filter.flags ^ ifa->ifa_flags) & filter.flagmask)
 		return 0;
 	if (filter.label) {
 		const char *label;
@@ -498,8 +523,8 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 			inet_prefix dst;
 			setzero(&dst, sizeof(dst));
 			dst.family = ifa->ifa_family;
-			memcpy(&dst.data, RTA_DATA(rta_tb[IFA_LOCAL]), 
-					RTA_PAYLOAD(rta_tb[IFA_LOCAL]));
+			memcpy(&dst.data, RTA_DATA(rta_tb[IFA_LOCAL]),
+				   RTA_PAYLOAD(rta_tb[IFA_LOCAL]));
 			if (inet_addr_match(&dst, &filter.pfx, filter.pfx.bits))
 				return 0;
 		}
@@ -511,46 +536,48 @@ int print_addrinfo(const struct sockaddr_nl *who, struct nlmsghdr *n,
 			if (flush_update())
 				return -1;
 		}
-		fn = (struct nlmsghdr*)(filter.flushb + NLMSG_ALIGN(filter.flushp));
+		fn = (struct nlmsghdr *) (filter.flushb +
+								  NLMSG_ALIGN(filter.flushp));
 		memcpy(fn, n, n->nlmsg_len);
 		fn->nlmsg_type = RTM_DELADDR;
 		fn->nlmsg_flags = NLM_F_REQUEST;
 		fn->nlmsg_seq = ++filter.rth->seq;
-		filter.flushp = (((char*)fn) + n->nlmsg_len) - filter.flushb;
+		filter.flushp = (((char *) fn) + n->nlmsg_len) - filter.flushb;
 		filter.flushed++;
 	}
 
 	return 0;
 }
 
-struct nlmsg_list
-{
-        struct nlmsg_list *next;
-        struct nlmsghdr   h;
+struct nlmsg_list {
+	struct nlmsg_list *next;
+	struct nlmsghdr h;
 };
 
-static int store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n,
-                       void *arg)
+static int
+store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
-        struct nlmsg_list **linfo = (struct nlmsg_list**)arg;
-        struct nlmsg_list *h;
-        struct nlmsg_list **lp;
+	struct nlmsg_list **linfo = (struct nlmsg_list **) arg;
+	struct nlmsg_list *h;
+	struct nlmsg_list **lp;
 
-        h = malloc(n->nlmsg_len+sizeof(void*));
-        if (h == NULL)
-                return -1;
+	h = malloc(n->nlmsg_len + sizeof(void *));
+	if (h == NULL)
+		return -1;
 
-        memcpy(&h->h, n, n->nlmsg_len);
-        h->next = NULL;
+	memcpy(&h->h, n, n->nlmsg_len);
+	h->next = NULL;
 
-        for (lp = linfo; *lp; lp = &(*lp)->next) /* NOTHING */;
-        *lp = h;
+	for (lp = linfo; *lp; lp = &(*lp)->next)	/* NOTHING */
+		;
+	*lp = h;
 
-        ll_remember_index((struct sockaddr_nl *)who, n, NULL);
-        return 0;
+	ll_remember_index((struct sockaddr_nl *) who, n, NULL);
+	return 0;
 }
 
-int ip_addr_flush(int family, char *dev, int scope)
+int
+ip_addr_flush(int family, char *dev, int scope)
 {
 	struct nlmsg_list *linfo = NULL;
 	struct rtnl_handle rth;
@@ -582,15 +609,15 @@ int ip_addr_flush(int family, char *dev, int scope)
 	}
 
 	int round = 0;
-	char flushb[4096-512];
+	char flushb[4096 - 512];
 
 	filter.flushb = flushb;
 	filter.flushp = 0;
 	filter.flushe = sizeof(flushb);
 	filter.rth = &rth;
-        filter.scopemask = -1;
+	filter.scopemask = -1;
 	filter.scope = scope;
-	
+
 	for (;;) {
 		if (rtnl_wilddump_request(&rth, filter.family, RTM_GETADDR) < 0) {
 			error("Cannot send dump request: %s", strerror(errno));
@@ -612,12 +639,13 @@ int ip_addr_flush(int family, char *dev, int scope)
 	rtnl_close(&rth);
 }
 
-int ip_addr_flush_all_ifs(interface *ifs, int ifs_n, int family, int scope)
+int
+ip_addr_flush_all_ifs(interface * ifs, int ifs_n, int family, int scope)
 {
-	int i, ret=0;
-	
-	for(i=0; i<ifs_n; i++)
-		ret+=ip_addr_flush(family, ifs[i].dev_name, scope);
+	int i, ret = 0;
+
+	for (i = 0; i < ifs_n; i++)
+		ret += ip_addr_flush(family, ifs[i].dev_name, scope);
 
 	return ret;
 }

src/if.h

@@ -23,39 +23,41 @@
 #include "inet.h"
 
 #define MAX_INTERFACES		16	/* The maximum number of network 
-					   interfaces, which can be used 
-					   by Netsukuku */
+								   interfaces, which can be used 
+								   by Netsukuku */
 
 typedef struct {
-	char		dev_name[IFNAMSIZ];	/* If name */
-	int		dev_idx;		/* If index */
+	char dev_name[IFNAMSIZ];	/* If name */
+	int dev_idx;				/* If index */
 } interface;
 
 /* from linux/ipv6.h */
 struct in6_ifreq {
 	struct in6_addr ifr6_addr;
-	uint32_t        ifr6_prefixlen;
-	int             ifr6_ifindex;
+	uint32_t ifr6_prefixlen;
+	int ifr6_ifindex;
 };
 
 
-int ifs_get_pos(interface *ifs, int ifs_n, interface *dev);
-interface *ifs_find_idx(interface *ifs, int ifs_n, int dev_idx);
-int ifs_find_devname(interface *ifs, int ifs_n, char *dev_name);
-void ifs_del(interface *ifs, int *ifs_n, int if_pos);
-void ifs_del_byname(interface *ifs, int *ifs_n, char *dev_name);
-void ifs_del_all_name(interface *ifs, int *ifs_n, char *dev_name);
+int ifs_get_pos(interface * ifs, int ifs_n, interface * dev);
+interface *ifs_find_idx(interface * ifs, int ifs_n, int dev_idx);
+int ifs_find_devname(interface * ifs, int ifs_n, char *dev_name);
+void ifs_del(interface * ifs, int *ifs_n, int if_pos);
+void ifs_del_byname(interface * ifs, int *ifs_n, char *dev_name);
+void ifs_del_all_name(interface * ifs, int *ifs_n, char *dev_name);
 const char *get_dev(int *dev_idx);
 int set_dev_up(char *dev);
 int set_dev_down(char *dev);
 int set_flags(char *dev, u_int flags, u_int mask);
-int set_all_ifs(interface *ifs, int ifs_n, int (*set_func)(char *dev));
-int if_init_all(char *ifs_name[MAX_INTERFACES], int ifs_n, interface *new_ifs, int *new_ifs_n);
+int set_all_ifs(interface * ifs, int ifs_n, int (*set_func) (char *dev));
+int if_init_all(char *ifs_name[MAX_INTERFACES], int ifs_n,
+				interface * new_ifs, int *new_ifs_n);
 void if_close_all(void);
-int set_all_dev_ip(inet_prefix ip, interface *ifs, int ifs_n);
+int set_all_dev_ip(inet_prefix ip, interface * ifs, int ifs_n);
 int set_dev_ip(inet_prefix ip, char *dev);
-int get_dev_ip(inet_prefix *ip, int family, char *dev);
+int get_dev_ip(inet_prefix * ip, int family, char *dev);
 int ip_addr_flush(int family, char *dev, int scope);
-int ip_addr_flush_all_ifs(interface *ifs, int ifs_n, int family, int scope);
+int ip_addr_flush_all_ifs(interface * ifs, int ifs_n, int family,
+						  int scope);
 
-#endif /*IF_H*/
+#endif							/*IF_H */

src/igs.h

@@ -43,7 +43,7 @@
 \*/
 
 /* Minum bandwidth necessary to share an internet connection */
-#define MIN_CONN_BANDWIDTH	3		/* 16 Kb/s */
+#define MIN_CONN_BANDWIDTH	3	/* 16 Kb/s */
 
 #define MAX_INTERNET_HNAMES	10
 #define MAX_INTERNET_HNAME_SZ	64
@@ -51,17 +51,17 @@
 #define IGW_HOST_PING_TIMEOUT	10
 #define INET_NEXT_PING_WAIT	10
 
-#define IGW_BW_DELTA		1		/* If the difference between the old and the new
-						   igw->bandwidth is >= IGW_BW_DELTA, then 
-						   me.igws is reordered and the routing table
-						   updated */
+#define IGW_BW_DELTA		1	/* If the difference between the old and the new
+								   igw->bandwidth is >= IGW_BW_DELTA, then 
+								   me.igws is reordered and the routing table
+								   updated */
 #define MAXIGWS			MAXGROUPNODE	/* max number of internet 
-						   gateways in each level */
+										   gateways in each level */
 
 #define RTTABLE_IGW		221		/* Routing tables from 221 to 244 */
-#define RTTABLE_ALISHIELD	245		/* Anti Loop multi-Igw Shield
-						   (what a damn long name, read the Ntk_IGS
-						   RFC) */
+#define RTTABLE_ALISHIELD	245	/* Anti Loop multi-Igw Shield
+								   (what a damn long name, read the Ntk_IGS
+								   RFC) */
 #define FWMARK_ALISHIELD	25
 
 #ifdef DEBUG
@@ -73,10 +73,10 @@
  * inet_gw flags
  */
 #define IGW_TUNNELED		1
-#define IGW_ACTIVE		(1<<1)		/* This gw is being used in the
-						   routing table */
-#define IGW_RTRULE		(1<<2)		/* The relative routing rule is already
-						   present */
+#define IGW_ACTIVE		(1<<1)	/* This gw is being used in the
+								   routing table */
+#define IGW_RTRULE		(1<<2)	/* The relative routing rule is already
+								   present */
 
 /*
  * internet_gateway
@@ -84,29 +84,28 @@
  * This struct points to a particular (g)node which is sharing its Internet 
  * connection
  */
-struct internet_gateway
-{
-	LLIST_HDR	(struct internet_gateway);
+struct internet_gateway {
+	LLIST_HDR(struct internet_gateway);
 
-	u_int		ip[MAX_IP_INT];
-	u_char		gid;
-	map_node	*node;
+	u_int ip[MAX_IP_INT];
+	u_char gid;
+	map_node *node;
 
-	char		flags;
-	u_char		bandwidth;	/* Its Internet bandwidth */
+	char flags;
+	u_char bandwidth;			/* Its Internet bandwidth */
 };
 typedef struct internet_gateway inet_gw;
 
 /* We pack only `gid' and `bandwidth' */
 #define INET_GW_PACK_SZ		(sizeof(u_char)*2 + MAX_IP_SZ)
 
-struct inet_gw_pack_hdr
-{
-	int16_t		gws[MAX_LEVELS];/* Number of inet_gws there are in the
-					   pack, for each level */
-	u_char		levels;
-}_PACKED_;
-INT_INFO inet_gw_pack_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { MAX_LEVELS } };
+struct inet_gw_pack_hdr {
+	int16_t gws[MAX_LEVELS];	/* Number of inet_gws there are in the
+								   pack, for each level */
+	u_char levels;
+} _PACKED_;
+INT_INFO inet_gw_pack_hdr_iinfo =
+	{ 1, {INT_TYPE_16BIT}, {0}, {MAX_LEVELS} };
 
 /* 
  * The inet_gw_pack_body is:
@@ -141,15 +140,15 @@ INT_INFO inet_gw_pack_hdr_iinfo = { 1, { INT_TYPE_16BIT }, { 0 }, { MAX_LEVELS }
  * keep track of them.
  */
 struct default_inet_gw_nexthop {
-	inet_prefix	nexthop;
-
-	u_char		flags;		/* inet_gw flags */
-	
-	u_char		table;
-	u_char		tunl;		/* `tunl' is the number of the tunnel
-					   we are using to reach this igw. 
-					   (tunl = 4 means we are using the 
-					   "tunl4" device) */
+	inet_prefix nexthop;
+
+	u_char flags;				/* inet_gw flags */
+
+	u_char table;
+	u_char tunl;				/* `tunl' is the number of the tunnel
+								   we are using to reach this igw. 
+								   (tunl = 4 means we are using the 
+								   "tunl4" device) */
 };
 typedef struct default_inet_gw_nexthop igw_nexthop;
 
@@ -169,8 +168,8 @@ typedef struct default_inet_gw_nexthop igw_nexthop;
 \*/
 
 #define MAX_IGW_PER_QSPN_CHUNK		16	/* Maximum number of IGWs 
-						   contained in a single 
-						   QSPN chunk */
+										   contained in a single 
+										   QSPN chunk */
 
 
 /*\
@@ -190,46 +189,50 @@ igw_nexthop multigw_nh[MAX_MULTIPATH_ROUTES];
 \*/
 
 u_char bandwidth_in_8bit(u_int x);
-int str_to_inet_gw(char *str, inet_prefix *gw, char **dev);
+int str_to_inet_gw(char *str, inet_prefix * gw, char **dev);
 char **parse_internet_hosts(char *str, int *hosts);
 void free_internet_hosts(char **hnames, int hosts);
 
 void init_my_igw(void);
-void init_igws(inet_gw ***igws, int **igws_counter, int levels);
-void reset_igws(inet_gw **igws, int *igws_counter, int levels);
-void free_igws(inet_gw **igws, int *igws_counter, int levels);
-void init_my_igws(inet_gw **igws, int *igws_counter,
-		inet_gw ***my_new_igws, u_char my_bandwidth, 
-		map_node *cur_node, quadro_group *qg);
-void free_my_igws(inet_gw ***my_igs);
+void init_igws(inet_gw *** igws, int **igws_counter, int levels);
+void reset_igws(inet_gw ** igws, int *igws_counter, int levels);
+void free_igws(inet_gw ** igws, int *igws_counter, int levels);
+void init_my_igws(inet_gw ** igws, int *igws_counter,
+				  inet_gw *** my_new_igws, u_char my_bandwidth,
+				  map_node * cur_node, quadro_group * qg);
+void free_my_igws(inet_gw *** my_igs);
 void init_internet_gateway_search(void);
 void close_internet_gateway_search(void);
-inet_gw *igw_add_node(inet_gw **igws, int *igws_counter,  int level,
-		int gid, map_node *node, int ip[MAX_IP_INT], u_char bandwidth);
-int igw_del(inet_gw **igws, int *igws_counter, inet_gw *igw, int level);
-inet_gw *igw_find_node(inet_gw **igws, int level, map_node *node);
-inet_gw *igw_find_ip(inet_gw **igws, int level, u_int ip[MAX_IP_INT]);
-int igw_del_node(inet_gw **, int *,  int, map_node *);
+inet_gw *igw_add_node(inet_gw ** igws, int *igws_counter, int level,
+					  int gid, map_node * node, int ip[MAX_IP_INT],
+					  u_char bandwidth);
+int igw_del(inet_gw ** igws, int *igws_counter, inet_gw * igw, int level);
+inet_gw *igw_find_node(inet_gw ** igws, int level, map_node * node);
+inet_gw *igw_find_ip(inet_gw ** igws, int level, u_int ip[MAX_IP_INT]);
+int igw_del_node(inet_gw **, int *, int, map_node *);
 void igw_update_gnode_bw(int *, inet_gw **, inet_gw *, int, int, int);
-void igw_order(inet_gw **igws, int *igws_counter, inet_gw **my_igws, int level);
+void igw_order(inet_gw ** igws, int *igws_counter, inet_gw ** my_igws,
+			   int level);
 
 int igw_check_inet_conn(void);
 void *igw_check_inet_conn_t(void *null);
 void *igw_monitor_igws_t(void *null);
 
 int igw_exec_masquerade_sh(char *script, int stop);
-int igw_exec_tcshaper_sh(char *script, int stop, 
-		char *dev, int upload_bw, int dnload_bw);
-void reset_igw_nexthop(igw_nexthop *igwn);
+int igw_exec_tcshaper_sh(char *script, int stop,
+						 char *dev, int upload_bw, int dnload_bw);
+void reset_igw_nexthop(igw_nexthop * igwn);
 void reset_igw_rules(void);
-int igw_replace_def_igws(inet_gw **igws, int *igws_counter, 
-		inet_gw **my_igws, int max_levels, int family);
-
-char *igw_build_bentry(u_char level, size_t *pack_sz, int *new_bblocks);
-int igw_store_bblock(bnode_hdr *bblock_hdr, bnode_chunk *bchunk, u_char level);
-char *pack_igws(inet_gw **igws, int *igws_counter, int levels, int *pack_sz);
-int unpack_igws(char *pack, size_t pack_sz,
-		map_node *int_map, map_gnode **ext_map, int levels,
-		inet_gw ***new_igws, int **new_igws_counter);
-
-#endif /*IGS_H*/
+int igw_replace_def_igws(inet_gw ** igws, int *igws_counter,
+						 inet_gw ** my_igws, int max_levels, int family);
+
+char *igw_build_bentry(u_char level, size_t * pack_sz, int *new_bblocks);
+int igw_store_bblock(bnode_hdr * bblock_hdr, bnode_chunk * bchunk,
+					 u_char level);
+char *pack_igws(inet_gw ** igws, int *igws_counter, int levels,
+				int *pack_sz);
+int unpack_igws(char *pack, size_t pack_sz, map_node * int_map,
+				map_gnode ** ext_map, int levels, inet_gw *** new_igws,
+				int **new_igws_counter);
+
+#endif							/*IGS_H */

src/includes.h

@@ -68,4 +68,4 @@
 #undef USE_DMALLOC
 #endif
 
-#endif /*INCLUDES_H*/
+#endif							/*INCLUDES_H */

src/inet.h

@@ -52,7 +52,7 @@
  */
 #define NTK_RESTRICTED_10_MASK(x)	(((x) & ~0xff000000)|0x0a000000)
 #define NTK_RESTRICTED_172_MASK(x)	(((((x) & ~0xff000000) | 0xac000000) & ~0x00e00000) | 0x00100000)
-#define NTK_RESTRICTED_IPV6_MASK(x)	(((x) & ~0xffff0000)|0xfec00000) 
+#define NTK_RESTRICTED_IPV6_MASK(x)	(((x) & ~0xffff0000)|0xfec00000)
 
 
 /* `x' is in network order.
@@ -70,23 +70,24 @@
  * The inet_prefix struct is used to store IP addresses in the internals of
  * the Netsukuku code
  */
-typedef struct
-{
-	u_char	family;		     /* AF_INET or AF_INET6 */
-	u_short len;		     /* IP length: 4 or 16 (bytes) */
-	u_char	bits;		     /* Number of used bits of the IP */
-	u_int	data[MAX_IP_INT];    /* The address is kept in host long format, 
-				       word ORDER 1 (most significant word first) */
-}inet_prefix;
+typedef struct {
+	u_char family;				/* AF_INET or AF_INET6 */
+	u_short len;				/* IP length: 4 or 16 (bytes) */
+	u_char bits;				/* Number of used bits of the IP */
+	u_int data[MAX_IP_INT];		/* The address is kept in host long format, 
+								   word ORDER 1 (most significant word first) */
+} inet_prefix;
 
 /* int_info struct used for packing the inet_prefix struct.
  * Note that `data' is ignored 'cause it will be converted with
  * inet_htonl() / inet_ntohl() */
 INT_INFO inet_prefix_iinfo = { 1,
-			       { INT_TYPE_16BIT },
-			       { sizeof(u_char) },
-			       { 1 }
-			     };
+	{INT_TYPE_16BIT},
+	{sizeof(u_char)}
+	,
+	{1}
+};
+
 #define INET_PREFIX_PACK_SZ (sizeof(u_char) + sizeof(u_short) +\
 				sizeof(u_char) + MAX_IP_SZ)
 
@@ -101,8 +102,8 @@ INT_INFO inet_prefix_iinfo = { 1,
 /* * * defines from linux/include/net/ipv6.h * * */
 #define IPV6_ADDR_ANY		0x0000U
 
-#define IPV6_ADDR_UNICAST      	0x0001U	
-#define IPV6_ADDR_MULTICAST    	0x0002U	
+#define IPV6_ADDR_UNICAST      	0x0001U
+#define IPV6_ADDR_MULTICAST    	0x0002U
 
 #define IPV6_ADDR_LOOPBACK	0x0010U
 #define IPV6_ADDR_LINKLOCAL	0x0020U
@@ -124,7 +125,7 @@ INT_INFO inet_prefix_iinfo = { 1,
 #define IPTOS_RELIABILITY	0x04
 #define IPTOS_LOWCOST		0x02
 #define IPTOS_MINCOST		IPTOS_LOWCOST
-#endif /* IPTOS_LOWDELAY */
+#endif							/* IPTOS_LOWDELAY */
 
 
 /* 
@@ -132,45 +133,48 @@ INT_INFO inet_prefix_iinfo = { 1,
  */
 
 #define RESTRICTED_10		1	/* We are using the 10.x.x.x class for 
-					   the restricted mode */
+								   the restricted mode */
 #define RESTRICTED_172		2	/* 172.16.0.0-172.31.255.255 class */
 
 #define RESTRICTED_10_STR	"10.0.0.0-10.255.255.255"
 #define RESTRICTED_172_STR	"172.16.0.0-172.31.255.255"
 
 int my_family, restricted_mode, restricted_class;
-	
+
 /* 
  * * * Functions declaration * * 
  */
-void inet_ntohl(u_int *data, int family);
-void inet_htonl(u_int *data, int family);
-int inet_setip_raw(inet_prefix *ip, u_int *data, int family);
-int inet_setip(inet_prefix *ip, u_int *data, int family);
-int inet_setip_bcast(inet_prefix *ip, int family);
-int inet_setip_anyaddr(inet_prefix *ip, int family);
-int inet_setip_loopback(inet_prefix *ip, int family);
-int inet_setip_localaddr(inet_prefix *ip, int family, int class);
-int inet_is_ip_local(inet_prefix *ip, int class);
-void inet_copy_ipdata_raw(u_int *dst_data, inet_prefix *ip);
-void inet_copy_ipdata(u_int *dst_data, inet_prefix *ip);
-void inet_copy(inet_prefix *dst, inet_prefix *src);
-void pack_inet_prefix(inet_prefix *ip, char *pack);
-void unpack_inet_prefix(inet_prefix *ip, char *pack);
-int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits);
+void inet_ntohl(u_int * data, int family);
+void inet_htonl(u_int * data, int family);
+int inet_setip_raw(inet_prefix * ip, u_int * data, int family);
+int inet_setip(inet_prefix * ip, u_int * data, int family);
+int inet_setip_bcast(inet_prefix * ip, int family);
+int inet_setip_anyaddr(inet_prefix * ip, int family);
+int inet_setip_loopback(inet_prefix * ip, int family);
+int inet_setip_localaddr(inet_prefix * ip, int family, int class);
+int inet_is_ip_local(inet_prefix * ip, int class);
+void inet_copy_ipdata_raw(u_int * dst_data, inet_prefix * ip);
+void inet_copy_ipdata(u_int * dst_data, inet_prefix * ip);
+void inet_copy(inet_prefix * dst, inet_prefix * src);
+void pack_inet_prefix(inet_prefix * ip, char *pack);
+void unpack_inet_prefix(inet_prefix * ip, char *pack);
+int inet_addr_match(const inet_prefix * a, const inet_prefix * b,
+					int bits);
 int ipv6_addr_type(inet_prefix addr);
 int inet_validate_ip(inet_prefix ip);
 
 const char *ipraw_to_str(u_int ip[MAX_IP_INT], int family);
 const char *inet_to_str(inet_prefix ip);
-int str_to_inet(const char *src, inet_prefix *ip);
-int inet_to_sockaddr(inet_prefix *ip, u_short port, struct sockaddr *dst, socklen_t *dstlen);
-int sockaddr_to_inet(struct sockaddr *ip, inet_prefix *dst, u_short *port);
+int str_to_inet(const char *src, inet_prefix * ip);
+int inet_to_sockaddr(inet_prefix * ip, u_short port, struct sockaddr *dst,
+					 socklen_t * dstlen);
+int sockaddr_to_inet(struct sockaddr *ip, inet_prefix * dst,
+					 u_short * port);
 
 int new_socket(int sock_type);
 int new_dgram_socket(int sock_type);
 int inet_close(int *sk);
-int inet_getpeername(int sk, inet_prefix *ip, short *port);
+int inet_getpeername(int sk, inet_prefix * ip, short *port);
 int join_ipv6_multicast(int socket, int idx);
 
 int set_keepalive_sk(int socket);
@@ -179,27 +183,31 @@ int set_nonblock_sk(int fd);
 int unset_nonblock_sk(int fd);
 int set_reuseaddr_sk(int socket);
 int set_bindtodevice_sk(int socket, char *dev);
-int set_broadcast_sk(int socket, int family, inet_prefix *host, short port, 
-		int dev_idx);
+int set_broadcast_sk(int socket, int family, inet_prefix * host,
+					 short port, int dev_idx);
 int new_broadcast_sk(int family, int dev_idx);
 int set_tos_sk(int socket, int lowdelay);
 
-int new_tcp_conn(inet_prefix *host, short port, char *dev);
-int new_udp_conn(inet_prefix *host, short port, char *dev);
-int new_bcast_conn(inet_prefix *host, short port, int dev_idx);
+int new_tcp_conn(inet_prefix * host, short port, char *dev);
+int new_udp_conn(inet_prefix * host, short port, char *dev);
+int new_bcast_conn(inet_prefix * host, short port, int dev_idx);
 
 ssize_t inet_recv(int s, void *buf, size_t len, int flags);
-ssize_t inet_recvfrom(int s, void *buf, size_t len, int flags, 
-		struct sockaddr *from, socklen_t *fromlen);
-ssize_t inet_recv_timeout(int s, void *buf, size_t len, int flags, u_int timeout);
-ssize_t inet_recvfrom_timeout(int s, void *buf, size_t len, int flags, 
-		struct sockaddr *from, socklen_t *fromlen, u_int timeout);
+ssize_t inet_recvfrom(int s, void *buf, size_t len, int flags,
+					  struct sockaddr *from, socklen_t * fromlen);
+ssize_t inet_recv_timeout(int s, void *buf, size_t len, int flags,
+						  u_int timeout);
+ssize_t inet_recvfrom_timeout(int s, void *buf, size_t len, int flags,
+							  struct sockaddr *from, socklen_t * fromlen,
+							  u_int timeout);
 ssize_t inet_send(int s, const void *msg, size_t len, int flags);
-ssize_t inet_sendto(int s, const void *msg, size_t len, int flags, 
-		const struct sockaddr *to, socklen_t tolen);
-ssize_t inet_send_timeout(int s, const void *msg, size_t len, int flags, u_int timeout);
-ssize_t inet_sendto_timeout(int s, const void *msg, size_t len, int flags, 
-		const struct sockaddr *to, socklen_t tolen, u_int timeout);
-ssize_t inet_sendfile(int out_fd, int in_fd, off_t *offset, size_t count);
-
-#endif /*INET_H*/
+ssize_t inet_sendto(int s, const void *msg, size_t len, int flags,
+					const struct sockaddr *to, socklen_t tolen);
+ssize_t inet_send_timeout(int s, const void *msg, size_t len, int flags,
+						  u_int timeout);
+ssize_t inet_sendto_timeout(int s, const void *msg, size_t len, int flags,
+							const struct sockaddr *to, socklen_t tolen,
+							u_int timeout);
+ssize_t inet_sendfile(int out_fd, int in_fd, off_t * offset, size_t count);
+
+#endif							/*INET_H */

src/iptunnel.c

@@ -41,32 +41,36 @@
 #include "iptunnel.h"
 #include "common.h"
 
-static int do_add(int cmd, inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
-int do_del(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
-
-int tunnel_add(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number)
+static int do_add(int cmd, inet_prefix * remote, inet_prefix * local,
+				  char *dev, char *tunl_prefix, int tunl_number);
+int do_del(inet_prefix * remote, inet_prefix * local, char *dev,
+		   char *tunl_prefix, int tunl_number);
+
+int
+tunnel_add(inet_prefix * remote, inet_prefix * local, char *dev,
+		   char *tunl_prefix, int tunl_number)
 {
 	return do_add(SIOCADDTUNNEL, remote, local, dev, tunl_prefix,
-			tunl_number);
+				  tunl_number);
 }
 
-int tunnel_change(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number)
+int
+tunnel_change(inet_prefix * remote, inet_prefix * local, char *dev,
+			  char *tunl_prefix, int tunl_number)
 {
 	return do_add(SIOCGETTUNNEL, remote, local, dev, tunl_prefix,
-			tunl_number);
+				  tunl_number);
 }
 
-int tunnel_del(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number)
+int
+tunnel_del(inet_prefix * remote, inet_prefix * local, char *dev,
+		   char *tunl_prefix, int tunl_number)
 {
 	return do_del(remote, local, dev, tunl_prefix, tunl_number);
 }
 
-static int do_ioctl_get_ifindex(const char *dev)
+static int
+do_ioctl_get_ifindex(const char *dev)
 {
 	struct ifreq ifr;
 	int fd;
@@ -84,7 +88,8 @@ static int do_ioctl_get_ifindex(const char *dev)
 }
 
 #if 0
-static int do_ioctl_get_iftype(const char *dev)
+static int
+do_ioctl_get_iftype(const char *dev)
 {
 	struct ifreq ifr;
 	int fd;
@@ -94,14 +99,15 @@ static int do_ioctl_get_iftype(const char *dev)
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	err = ioctl(fd, SIOCGIFHWADDR, &ifr);
 	if (err) {
-		error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno));
+		error(ERROR_MSG "ioctl: %s", ERROR_POS, strerror(errno));
 		return -1;
 	}
 	close(fd);
 	return ifr.ifr_addr.sa_family;
 }
 
-static char * do_ioctl_get_ifname(int idx)
+static char *
+do_ioctl_get_ifname(int idx)
 {
 	static struct ifreq ifr;
 	int fd;
@@ -111,7 +117,7 @@ static char * do_ioctl_get_ifname(int idx)
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	err = ioctl(fd, SIOCGIFNAME, &ifr);
 	if (err) {
-		error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno));
+		error(ERROR_MSG "ioctl: %s", ERROR_POS, strerror(errno));
 		return NULL;
 	}
 	close(fd);
@@ -119,14 +125,15 @@ static char * do_ioctl_get_ifname(int idx)
 }
 #endif
 
-static int do_get_ioctl(const char *basedev, struct ip_tunnel_parm *p)
+static int
+do_get_ioctl(const char *basedev, struct ip_tunnel_parm *p)
 {
 	struct ifreq ifr;
 	int fd;
 	int err;
 
 	strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
-	ifr.ifr_ifru.ifru_data = (void*)p;
+	ifr.ifr_ifru.ifru_data = (void *) p;
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	err = ioctl(fd, SIOCGETTUNNEL, &ifr);
 	/*
@@ -137,7 +144,8 @@ static int do_get_ioctl(const char *basedev, struct ip_tunnel_parm *p)
 	return err;
 }
 
-static int do_add_ioctl(int cmd, const char *basedev, struct ip_tunnel_parm *p)
+static int
+do_add_ioctl(int cmd, const char *basedev, struct ip_tunnel_parm *p)
 {
 	struct ifreq ifr;
 	int fd;
@@ -147,17 +155,20 @@ static int do_add_ioctl(int cmd, const char *basedev, struct ip_tunnel_parm *p)
 		strncpy(ifr.ifr_name, p->name, IFNAMSIZ);
 	else
 		strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
-	ifr.ifr_ifru.ifru_data = (void*)p;
+	ifr.ifr_ifru.ifru_data = (void *) p;
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	err = ioctl(fd, cmd, &ifr);
-    error("Socket File Descriptor Is: %i cmd is: %i err is: %i ifr is: %s Errno is: %d", fd, cmd, err, &ifr, errno);
+	error
+		("Socket File Descriptor Is: %i cmd is: %i err is: %i ifr is: %s Errno is: %d",
+		 fd, cmd, err, &ifr, errno);
 	if (err)
-		error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno));
+		error(ERROR_MSG "ioctl: %s", ERROR_POS, strerror(errno));
 	close(fd);
 	return err;
 }
 
-static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
+static int
+do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
 {
 	struct ifreq ifr;
 	int fd;
@@ -167,11 +178,11 @@ static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
 		strncpy(ifr.ifr_name, p->name, IFNAMSIZ);
 	else
 		strncpy(ifr.ifr_name, basedev, IFNAMSIZ);
-	ifr.ifr_ifru.ifru_data = (void*)p;
+	ifr.ifr_ifru.ifru_data = (void *) p;
 	fd = socket(AF_INET, SOCK_DGRAM, 0);
 	err = ioctl(fd, SIOCDELTUNNEL, &ifr);
 	if (err)
-		error(ERROR_MSG "ioctl: %s",ERROR_POS, strerror(errno));
+		error(ERROR_MSG "ioctl: %s", ERROR_POS, strerror(errno));
 	close(fd);
 	return err;
 }
@@ -180,9 +191,10 @@ static int do_del_ioctl(const char *basedev, struct ip_tunnel_parm *p)
  * fill_tunnel_parm: fills the `p' struct.
  * `remote' and `local' must be in host order
  */
-static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local,
-		char *dev, char *tunl_prefix, int tunl_number,
-		struct ip_tunnel_parm *p)
+static int
+fill_tunnel_parm(int cmd, inet_prefix * remote, inet_prefix * local,
+				 char *dev, char *tunl_prefix, int tunl_number,
+				 struct ip_tunnel_parm *p)
 {
 	char medium[IFNAMSIZ];
 
@@ -192,17 +204,17 @@ static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local,
 	p->iph.version = 4;
 	p->iph.ihl = 5;
 #ifndef IP_DF
-#define IP_DF		0x4000		/* Flag: "Don't Fragment"	*/
+#define IP_DF		0x4000		/* Flag: "Don't Fragment"   */
 #endif
 	p->iph.frag_off = htons(IP_DF);
 	p->iph.protocol = IPPROTO_IPIP;
 
-	if(remote)
+	if (remote)
 		p->iph.daddr = htonl(remote->data[0]);
-	if(local)
+	if (local)
 		p->iph.saddr = htonl(local->data[0]);
-	if(dev)
-		strncpy(medium, dev, IFNAMSIZ-1);
+	if (dev)
+		strncpy(medium, dev, IFNAMSIZ - 1);
 
 	sprintf(p->name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
 	if (cmd == SIOCCHGTUNNEL) {
@@ -233,7 +245,8 @@ static int fill_tunnel_parm(int cmd, inet_prefix *remote, inet_prefix *local,
 /*
  * do_get: returns 1 if the tunnel named `dev' exists.
  */
-int do_get(char *dev)
+int
+do_get(char *dev)
 {
 	struct ip_tunnel_parm old_p;
 	memset(&old_p, 0, sizeof(old_p));
@@ -244,41 +257,43 @@ int do_get(char *dev)
 	return 1;
 }
 
-static int do_add(int cmd, inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number)
+static int
+do_add(int cmd, inet_prefix * remote, inet_prefix * local, char *dev,
+	   char *tunl_prefix, int tunl_number)
 {
 	struct ip_tunnel_parm p;
 
 	if (fill_tunnel_parm(cmd, remote, local, dev, tunl_prefix,
-				tunl_number, &p) < 0)
+						 tunl_number, &p) < 0)
 		return -1;
 
 	if (p.iph.ttl && p.iph.frag_off == 0)
 		fatal("ttl != 0 and noptmudisc are incompatible");
 
 	switch (p.iph.protocol) {
-		case IPPROTO_IPIP:
-			return do_add_ioctl(cmd, DEFAULT_TUNL_IF, &p);
-		default:
-			fatal("cannot determine tunnel mode (ipip, gre or sit)\n");
+	case IPPROTO_IPIP:
+		return do_add_ioctl(cmd, DEFAULT_TUNL_IF, &p);
+	default:
+		fatal("cannot determine tunnel mode (ipip, gre or sit)\n");
 	}
 	return -1;
 }
 
-int do_del(inet_prefix *remote, inet_prefix *local, char *dev, char *tunl_prefix,
-		int tunl_number)
+int
+do_del(inet_prefix * remote, inet_prefix * local, char *dev,
+	   char *tunl_prefix, int tunl_number)
 {
 	struct ip_tunnel_parm p;
 
 	if (fill_tunnel_parm(SIOCDELTUNNEL, remote, local, dev, tunl_prefix,
-				tunl_number, &p) < 0)
+						 tunl_number, &p) < 0)
 		return -1;
 
 	switch (p.iph.protocol) {
-		case IPPROTO_IPIP:
-			return do_del_ioctl(DEFAULT_TUNL_IF, &p);
-		default:
-			return do_del_ioctl(p.name, &p);
+	case IPPROTO_IPIP:
+		return do_del_ioctl(DEFAULT_TUNL_IF, &p);
+	default:
+		return do_del_ioctl(p.name, &p);
 	}
 	return -1;
 }
@@ -287,13 +302,14 @@ int do_del(inet_prefix *remote, inet_prefix *local, char *dev, char *tunl_prefix
  * tun_add_tunl: it adds in the `ifs' array a new struct which refers to
  * the tunnel "tunlX", where X is a number equal to `tunl'.
  */
-int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
+int
+tun_add_tunl(interface * ifs, char *tunl_prefix, u_char tunl_number)
 {
 	char tunl_name[IFNAMSIZ];
 
 	sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
 	strncpy(ifs->dev_name, tunl_name, IFNAMSIZ);
-	if(!(ifs->dev_idx=do_ioctl_get_ifindex(tunl_name)))
+	if (!(ifs->dev_idx = do_ioctl_get_ifindex(tunl_name)))
 		return -1;
 
 	return 0;
@@ -305,15 +321,16 @@ int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
  * is a number equal to `tunl'.
  * If no such struct is found, -1 is returned.
  */
-int tun_del_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
+int
+tun_del_tunl(interface * ifs, char *tunl_prefix, u_char tunl_number)
 {
 	char tunl_name[IFNAMSIZ];
 	int i;
 
 	sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
 
-	for(i=0; i<MAX_TUNNEL_IFS; i++)
-		if(!strncmp(ifs[i].dev_name, tunl_name, IFNAMSIZ)) {
+	for (i = 0; i < MAX_TUNNEL_IFS; i++)
+		if (!strncmp(ifs[i].dev_name, tunl_name, IFNAMSIZ)) {
 			memset(&ifs[i], 0, sizeof(interface));
 			return 0;
 		}
@@ -323,9 +340,10 @@ int tun_del_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number)
 
 
 
-void init_tunnels_ifs(void)
+void
+init_tunnels_ifs(void)
 {
-	memset(tunnel_ifs, 0, sizeof(interface)*MAX_TUNNEL_IFS);
+	memset(tunnel_ifs, 0, sizeof(interface) * MAX_TUNNEL_IFS);
 }
 
 /*
@@ -333,12 +351,13 @@ void init_tunnels_ifs(void)
  * `tunnel_ifs' array which isn't used yet.
  * If the whole array is full, -1 is returned.
  */
-int first_free_tunnel_if(void)
+int
+first_free_tunnel_if(void)
 {
 	int i;
 
-	for(i=0; i<MAX_TUNNEL_IFS; i++)
-		if(!*tunnel_ifs[i].dev_name && !tunnel_ifs[i].dev_idx)
+	for (i = 0; i < MAX_TUNNEL_IFS; i++)
+		if (!*tunnel_ifs[i].dev_name && !tunnel_ifs[i].dev_idx)
 			return i;
 	return -1;
 }
@@ -347,16 +366,17 @@ int first_free_tunnel_if(void)
  * set_tunnel_ip: it brings down and up and set the `tunl_ip' IP to the
  * "tunl`tunl_number'" tunnel device
  */
-int set_tunnel_ip(char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip)
+int
+set_tunnel_ip(char *tunl_prefix, int tunl_number, inet_prefix * tunl_ip)
 {
 	const char *ntop;
-	ntop=inet_to_str(*tunl_ip);
+	ntop = inet_to_str(*tunl_ip);
 
 	set_all_ifs(&tunnel_ifs[tunl_number], 1, set_dev_down);
 	set_all_ifs(&tunnel_ifs[tunl_number], 1, set_dev_up);
-	if(set_all_dev_ip(*tunl_ip, &tunnel_ifs[tunl_number], 1) < 0) {
+	if (set_all_dev_ip(*tunl_ip, &tunnel_ifs[tunl_number], 1) < 0) {
 		error("Cannot set the %s ip to " TUNL_STRING,
-				ntop, TUNL_N(tunl_prefix, tunl_number));
+			  ntop, TUNL_N(tunl_prefix, tunl_number));
 		return -1;
 	}
 	return 0;
@@ -366,8 +386,9 @@ int set_tunnel_ip(char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip)
  * add_tunnel_if: creates a new tunnel, adds it in the `tunnel_ifs' array, and
  * if `tunl_ip' isn't null, sets to the tunnel the IP `tunl_ip'.
  */
-int add_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip)
+int
+add_tunnel_if(inet_prefix * remote, inet_prefix * local, char *dev,
+			  char *tunl_prefix, int tunl_number, inet_prefix * tunl_ip)
 {
 	char tunl_name[IFNAMSIZ];
 
@@ -375,26 +396,27 @@ int add_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
 	 * tunl0 zero is a special tunnel, it cannot be created nor destroyed.
 	 * It's pure energy.
 	 */
-	if(!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number)
+	if (!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number)
 		goto skip_krnl_add_tunl;
 
-	if(tunnel_add(remote, local, dev, tunl_prefix, tunl_number) < 0) {
+	if (tunnel_add(remote, local, dev, tunl_prefix, tunl_number) < 0) {
 		error("Cannot add the \"" TUNL_STRING "\" tunnel",
-				TUNL_N(tunl_prefix, tunl_number));
+			  TUNL_N(tunl_prefix, tunl_number));
 		return -1;
 	}
 
-skip_krnl_add_tunl:
+  skip_krnl_add_tunl:
 
-	if(tun_add_tunl(&tunnel_ifs[tunl_number], tunl_prefix, tunl_number) < 0)
+	if (tun_add_tunl(&tunnel_ifs[tunl_number], tunl_prefix, tunl_number) <
+		0)
 		return -1;
 
-	if(tunl_ip) {
+	if (tunl_ip) {
 
 		/*
 		 * ifconfig tunnel `tunl_ip' up
 		 */
-		if(set_tunnel_ip(tunl_prefix, tunl_number, tunl_ip) < 0)
+		if (set_tunnel_ip(tunl_prefix, tunl_number, tunl_ip) < 0)
 			return -1;
 
 
@@ -405,8 +427,8 @@ skip_krnl_add_tunl:
 		sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, tunl_number));
 		rt_append_subnet_src(tunl_ip, tunl_name);
 
-		if(route_rp_filter_all_dev(my_family, &tunnel_ifs[tunl_number],
-				1, 0) < 0)
+		if (route_rp_filter_all_dev(my_family, &tunnel_ifs[tunl_number],
+									1, 0) < 0)
 			return -1;
 	}
 
@@ -416,34 +438,36 @@ skip_krnl_add_tunl:
 /*
  * del_tunnel_if: the inverse of add_tunnel_if() (see above)
  */
-int del_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number)
+int
+del_tunnel_if(inet_prefix * remote, inet_prefix * local, char *dev,
+			  char *tunl_prefix, int tunl_number)
 {
 	/* tunl0 is a highlander */
-	if(!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number)
+	if (!strcmp(tunl_prefix, DEFAULT_TUNL_PREFIX) && !tunl_number)
 		goto skip_krnl_del_tunl;
 
-	if(tunnel_del(remote, local, dev, tunl_prefix, tunl_number) < 0) {
+	if (tunnel_del(remote, local, dev, tunl_prefix, tunl_number) < 0) {
 		error("Cannot delete the \"" TUNL_STRING "\" tunnel",
-				TUNL_N(tunl_prefix, tunl_number));
+			  TUNL_N(tunl_prefix, tunl_number));
 		return -1;
 	}
 
-skip_krnl_del_tunl:
+  skip_krnl_del_tunl:
 
 	tun_del_tunl(tunnel_ifs, tunl_prefix, tunl_number);
 	return 0;
 }
 
-void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix)
+void
+del_all_tunnel_ifs(inet_prefix * remote, inet_prefix * local, char *dev,
+				   char *tunl_prefix)
 {
 	char tunl_name[IFNAMSIZ];
 	int i;
 
-	for(i=0; i<MAX_TUNNEL_IFS; i++) {
+	for (i = 0; i < MAX_TUNNEL_IFS; i++) {
 		sprintf(tunl_name, TUNL_STRING, TUNL_N(tunl_prefix, i));
-		if(do_get(tunl_name))
+		if (do_get(tunl_name))
 			del_tunnel_if(remote, local, 0, tunl_prefix, i);
 		else
 			break;

src/iptunnel.h

@@ -31,8 +31,8 @@
 #define TUNL_N(prefix, x)	prefix, x
 
 #define MAX_TUNNEL_IFS		24	/* it must be >= MAX_MULTIPATH_ROUTES,
-					   since in igs.c we are using a tunnel
-					   for each nexthop inet-gw */
+								   since in igs.c we are using a tunnel
+								   for each nexthop inet-gw */
 
 /*
  * * Globals * *
@@ -46,23 +46,25 @@ interface tunnel_ifs[MAX_TUNNEL_IFS];
  */
 
 
-int tunnel_add(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
-int tunnel_change(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
-int tunnel_del(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
+int tunnel_add(inet_prefix * remote, inet_prefix * local, char *dev,
+			   char *tunl_prefix, int tunl_number);
+int tunnel_change(inet_prefix * remote, inet_prefix * local, char *dev,
+				  char *tunl_prefix, int tunl_number);
+int tunnel_del(inet_prefix * remote, inet_prefix * local, char *dev,
+			   char *tunl_prefix, int tunl_number);
 
-int tun_add_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number);
-int tun_del_tunl(interface *ifs, char *tunl_prefix, u_char tunl_number);
+int tun_add_tunl(interface * ifs, char *tunl_prefix, u_char tunl_number);
+int tun_del_tunl(interface * ifs, char *tunl_prefix, u_char tunl_number);
 void init_tunnels_ifs(void);
-int set_tunnel_ip(char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip);
+int set_tunnel_ip(char *tunl_prefix, int tunl_number,
+				  inet_prefix * tunl_ip);
 int first_free_tunnel_if(void);
 int do_get(char *dev);
-int add_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number, inet_prefix *tunl_ip);
-int del_tunnel_if(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix, int tunl_number);
-void del_all_tunnel_ifs(inet_prefix *remote, inet_prefix *local, char *dev,
-		char *tunl_prefix);
-#endif /* IPTUNNEL_H */
+int add_tunnel_if(inet_prefix * remote, inet_prefix * local, char *dev,
+				  char *tunl_prefix, int tunl_number,
+				  inet_prefix * tunl_ip);
+int del_tunnel_if(inet_prefix * remote, inet_prefix * local, char *dev,
+				  char *tunl_prefix, int tunl_number);
+void del_all_tunnel_ifs(inet_prefix * remote, inet_prefix * local,
+						char *dev, char *tunl_prefix);
+#endif							/* IPTUNNEL_H */

src/ipv6-gmp.c

@@ -24,42 +24,45 @@
 #include "ipv6-gmp.h"
 
 /*y=x+y*/
-int sum_128(unsigned int *x, unsigned int *y)
+int
+sum_128(unsigned int *x, unsigned int *y)
 {
 	mpz_t xx, yy, res;
 	size_t count;
-	
+
 	mpz_init(res);
 	mpz_init(xx);
 	mpz_init(yy);
-	mpz_import (xx, 4, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, x);
-	mpz_import (yy, 4, HOST_ORDER, sizeof(y[0]), NATIVE_ENDIAN, 0, y);
+	mpz_import(xx, 4, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, x);
+	mpz_import(yy, 4, HOST_ORDER, sizeof(y[0]), NATIVE_ENDIAN, 0, y);
 
 	mpz_add(res, xx, yy);
-	memset(y, '\0', sizeof(y[0])*4);
+	memset(y, '\0', sizeof(y[0]) * 4);
 	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, res);
-	
+
 	mpz_clear(xx);
 	mpz_clear(yy);
 	mpz_clear(res);
-	return 0;	
+	return 0;
 }
 
 /*y=x+y*/
-int sum_int(unsigned int x, unsigned int *y)
+int
+sum_int(unsigned int x, unsigned int *y)
 {
-	unsigned int z[4]=ZERO128;
-	
-	z[3]=x;
+	unsigned int z[4] = ZERO128;
+
+	z[3] = x;
 	return sum_128(z, y);
 }
 
 /*y=x-y*/
-int sub_128(unsigned int *x, unsigned int *y)
+int
+sub_128(unsigned int *x, unsigned int *y)
 {
 	mpz_t xx, yy, res;
 	size_t count;
-	
+
 	mpz_init(res);
 	mpz_init(xx);
 	mpz_init(yy);
@@ -67,57 +70,61 @@ int sub_128(unsigned int *x, unsigned int *y)
 	mpz_import(yy, 4, HOST_ORDER, sizeof(y[0]), NATIVE_ENDIAN, 0, y);
 
 	mpz_sub(res, xx, yy);
-	memset(y, '\0', sizeof(y[0])*4);
+	memset(y, '\0', sizeof(y[0]) * 4);
 	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, res);
-	
+
 	mpz_clear(xx);
 	mpz_clear(yy);
 	mpz_clear(res);
-	return 0;	
+	return 0;
 }
 
 /* y=y-x */
-int sub_int(unsigned int *y, unsigned int x)
+int
+sub_int(unsigned int *y, unsigned int x)
 {
-	unsigned int z[4]=ZERO128;
+	unsigned int z[4] = ZERO128;
 
-	z[3]=x;
+	z[3] = x;
 	return sub_128(z, y);
 }
 
 /*y=x/y*/
-int div_128(unsigned int *x, unsigned int *y)
+int
+div_128(unsigned int *x, unsigned int *y)
 {
 	mpz_t xx, yy, res;
 	size_t count;
-	
+
 	mpz_init(res);
 	mpz_init(xx);
 	mpz_init(yy);
 	mpz_import(xx, 4, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, x);
 	mpz_import(yy, 4, HOST_ORDER, sizeof(y[0]), NATIVE_ENDIAN, 0, y);
-	
+
 	mpz_tdiv_q(res, xx, yy);
-	memset(y, '\0', sizeof(y[0])*4);
+	memset(y, '\0', sizeof(y[0]) * 4);
 	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, res);
-	
+
 	mpz_clear(xx);
 	mpz_clear(yy);
 	mpz_clear(res);
-	return 0;	
+	return 0;
 }
 
 /* y=y/x */
-int div_int(unsigned int *y, unsigned int x)
+int
+div_int(unsigned int *y, unsigned int x)
 {
-	unsigned int z[4]=ZERO128;
+	unsigned int z[4] = ZERO128;
 
-	z[3]=x;
+	z[3] = x;
 	return div_128(z, y);
 }
 
 /* y=y/x */
-int div_mpz(unsigned int *y, mpz_t x)
+int
+div_mpz(unsigned int *y, mpz_t x)
 {
 	mpz_t yy, res;
 	size_t count;
@@ -125,39 +132,42 @@ int div_mpz(unsigned int *y, mpz_t x)
 	mpz_init(res);
 	mpz_init(yy);
 	mpz_import(yy, 4, HOST_ORDER, sizeof(y[0]), NATIVE_ENDIAN, 0, y);
-	
+
 	mpz_tdiv_q(res, yy, x);
-	memset(y, '\0', sizeof(y[0])*4);
+	memset(y, '\0', sizeof(y[0]) * 4);
 	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, res);
-	
+
 	mpz_clear(yy);
 	mpz_clear(res);
-	return 0;	
+	return 0;
 }
 
 /* "ORDER can be 1 for most significant word first or -1 for least significant first." */
-int htonl_128(unsigned int *x, unsigned int *y)
+int
+htonl_128(unsigned int *x, unsigned int *y)
 {
 	mpz_t xx;
 	size_t count;
-	
+
 	mpz_init(xx);
-	mpz_import(xx, 4,     HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN,  0, x);
-	memset(y, '\0', sizeof(y[0])*4);
-	mpz_export(y, &count, NETWORK_ORDER, sizeof(x[0]), NETWORK_ENDIAN, 0, xx);
+	mpz_import(xx, 4, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, x);
+	memset(y, '\0', sizeof(y[0]) * 4);
+	mpz_export(y, &count, NETWORK_ORDER, sizeof(x[0]), NETWORK_ENDIAN, 0,
+			   xx);
 	mpz_clear(xx);
 	return 0;
 }
 
-int ntohl_128(unsigned int *x, unsigned int *y)
+int
+ntohl_128(unsigned int *x, unsigned int *y)
 {
 	mpz_t xx;
 	size_t count;
-	
+
 	mpz_init(xx);
-	mpz_import(xx, 4,     NETWORK_ORDER, sizeof(x[0]), NETWORK_ENDIAN, 0, x);
-	memset(y, '\0', sizeof(y[0])*4);
-	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN,  0, xx);	
+	mpz_import(xx, 4, NETWORK_ORDER, sizeof(x[0]), NETWORK_ENDIAN, 0, x);
+	memset(y, '\0', sizeof(y[0]) * 4);
+	mpz_export(y, &count, HOST_ORDER, sizeof(x[0]), NATIVE_ENDIAN, 0, xx);
 	mpz_clear(xx);
 
 	return 0;

src/ipv6-gmp.h

@@ -32,7 +32,7 @@
 #define HOST_ENDIAN  		-1
 #define NETWORK_ENDIAN		1
 
-int sum_int(unsigned int , unsigned int *);
+int sum_int(unsigned int, unsigned int *);
 int sum_128(unsigned int *, unsigned int *);
 int sub_int(unsigned int *, unsigned int);
 int sub_128(unsigned int *, unsigned int *);
@@ -42,4 +42,4 @@ int div_mpz(unsigned int *, mpz_t);
 int htonl_128(unsigned int *, unsigned int *);
 int ntohl_128(unsigned int *, unsigned int *);
 
-#endif /*IPV6_GMP_H*/
+#endif							/*IPV6_GMP_H */

src/krnl_route.c

@@ -36,90 +36,100 @@
 #define NTK_MULTIPATH_ALGO IP_MP_ALG_WRANDOM
 #endif
 
-static struct
-{
-        int tb;
-        int flushed;
-        char *flushb;
-        int flushp;
-        int flushe;
-        struct rtnl_handle *rth;
-        int protocol, protocolmask;
-        int scope, scopemask;
-        int type, typemask;
-        int tos, tosmask;
-        int iif, iifmask;
-        int oif, oifmask;
-        int realm, realmmask;
-        inet_prefix rprefsrc;
-        inet_prefix rvia;
-        inet_prefix rdst;
-        inet_prefix mdst;
-        inet_prefix rsrc;
-        inet_prefix msrc;
+static struct {
+	int tb;
+	int flushed;
+	char *flushb;
+	int flushp;
+	int flushe;
+	struct rtnl_handle *rth;
+	int protocol, protocolmask;
+	int scope, scopemask;
+	int type, typemask;
+	int tos, tosmask;
+	int iif, iifmask;
+	int oif, oifmask;
+	int realm, realmmask;
+	inet_prefix rprefsrc;
+	inet_prefix rvia;
+	inet_prefix rdst;
+	inet_prefix mdst;
+	inet_prefix rsrc;
+	inet_prefix msrc;
 } filter;
 
-void route_reset_filter()
+void
+route_reset_filter()
 {
-        setzero(&filter, sizeof(filter));
-        filter.mdst.bits = -1;
-        filter.msrc.bits = -1;
+	setzero(&filter, sizeof(filter));
+	filter.mdst.bits = -1;
+	filter.msrc.bits = -1;
 }
 
-int route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
-		inet_prefix *src, inet_prefix *to, struct nexthop *nhops, 
-		char *dev, u_char table);
+int route_exec(int route_cmd, int route_type, int route_scope,
+			   unsigned flags, inet_prefix * src, inet_prefix * to,
+			   struct nexthop *nhops, char *dev, u_char table);
 
-int route_add(ROUTE_CMD_VARS)
+int
+route_add(ROUTE_CMD_VARS)
 {
 	return route_exec(RTM_NEWROUTE, type, scope, NLM_F_CREATE | NLM_F_EXCL,
-			src, to, nhops, dev, table);
+					  src, to, nhops, dev, table);
 }
 
-int route_del(ROUTE_CMD_VARS)
+int
+route_del(ROUTE_CMD_VARS)
 {
-	return route_exec(RTM_DELROUTE, type, scope, 0, src, to, nhops, dev, table);
+	return route_exec(RTM_DELROUTE, type, scope, 0, src, to, nhops, dev,
+					  table);
 }
 
 /*If it doesn't exist, CREATE IT! de ih oh oh*/
-int route_replace(ROUTE_CMD_VARS)
+int
+route_replace(ROUTE_CMD_VARS)
 {
-	return route_exec(RTM_NEWROUTE, type, scope, NLM_F_REPLACE | NLM_F_CREATE,
-			src, to, nhops, dev, table);
+	return route_exec(RTM_NEWROUTE, type, scope,
+					  NLM_F_REPLACE | NLM_F_CREATE, src, to, nhops, dev,
+					  table);
 }
 
-int route_change(ROUTE_CMD_VARS)
+int
+route_change(ROUTE_CMD_VARS)
 {
-	return route_exec(RTM_NEWROUTE, type, scope, NLM_F_REPLACE, src, to, nhops, 
-			dev, table);
+	return route_exec(RTM_NEWROUTE, type, scope, NLM_F_REPLACE, src, to,
+					  nhops, dev, table);
 }
 
-int route_append(ROUTE_CMD_VARS)
+int
+route_append(ROUTE_CMD_VARS)
 {
-	return route_exec(RTM_NEWROUTE, type, scope, NLM_F_CREATE|NLM_F_APPEND,
-			src, to, nhops, dev, table);
+	return route_exec(RTM_NEWROUTE, type, scope,
+					  NLM_F_CREATE | NLM_F_APPEND, src, to, nhops, dev,
+					  table);
 }
 
-int add_nexthops(struct nlmsghdr *n, struct rtmsg *r, struct nexthop *nhop)
+int
+add_nexthops(struct nlmsghdr *n, struct rtmsg *r, struct nexthop *nhop)
 {
 	char buf[1024];
-	struct rtattr *rta = (void*)buf;
+	struct rtattr *rta = (void *) buf;
 	struct rtnexthop *rtnh;
-	int i=0, idx;
+	int i = 0, idx;
 
 	rta->rta_type = RTA_MULTIPATH;
 	rta->rta_len = RTA_LENGTH(0);
 	rtnh = RTA_DATA(rta);
 
-	if(!nhop[i+1].dev) {
+	if (!nhop[i + 1].dev) {
 		/* Just one gateway */
 		r->rtm_family = nhop[i].gw.family;
-		addattr_l(n, sizeof(struct rt_request), RTA_GATEWAY, &nhop[i].gw.data, nhop[i].gw.len);
+		addattr_l(n, sizeof(struct rt_request), RTA_GATEWAY,
+				  &nhop[i].gw.data, nhop[i].gw.len);
 
-		if(nhop[0].dev) {
+		if (nhop[0].dev) {
 			if ((idx = ll_name_to_index(nhop[0].dev)) == 0) {
-				error(ERROR_MSG "Device \"%s\" doesn't really exist\n", 
-						ERROR_POS, nhop[0].dev);
+				error(ERROR_MSG "Device \"%s\" doesn't really exist\n",
+					  ERROR_POS, nhop[0].dev);
 				return -1;
 			}
 			addattr32(n, sizeof(struct rt_request), RTA_OIF, idx);
@@ -127,32 +137,34 @@ int add_nexthops(struct nlmsghdr *n, struct rtmsg *r, struct nexthop *nhop)
 
 		return 0;
 	}
-
 #if 0
 	/* We have more than one nexthop, equalize them */
-	req.rt.rtm_flags|=RTM_F_EQUALIZE;
+	req.rt.rtm_flags |= RTM_F_EQUALIZE;
 #endif
 
-	while (nhop[i].dev!=0) {
+	while (nhop[i].dev != 0) {
 		setzero(rtnh, sizeof(*rtnh));
 		rtnh->rtnh_len = sizeof(*rtnh);
 		rta->rta_len += rtnh->rtnh_len;
 
 		if (nhop[i].gw.len) {
-			if(nhop[i].gw.family==AF_INET)
+			if (nhop[i].gw.family == AF_INET)
 				rta_addattr32(rta, 4096, RTA_GATEWAY, nhop[i].gw.data[0]);
-			else if(nhop[i].gw.family==AF_INET6)
-				rta_addattr_l(rta, 4096, RTA_GATEWAY, nhop[i].gw.data, nhop[i].gw.len);
+			else if (nhop[i].gw.family == AF_INET6)
+				rta_addattr_l(rta, 4096, RTA_GATEWAY, nhop[i].gw.data,
+							  nhop[i].gw.len);
 			rtnh->rtnh_len += sizeof(struct rtattr) + nhop[i].gw.len;
 		}
 
-		if (nhop[i].dev) 
+		if (nhop[i].dev)
 			if ((rtnh->rtnh_ifindex = ll_name_to_index(nhop[i].dev)) == 0)
-				fatal("%s:%d, Cannot find device \"%s\"\n", ERROR_POS, nhop[i].dev);
+				fatal("%s:%d, Cannot find device \"%s\"\n", ERROR_POS,
+					  nhop[i].dev);
 
 		if (nhop[i].hops == 0) {
-			debug(DBG_NORMAL, "hops=%d is invalid. Using hops=255\n", nhop[i].hops);
-			rtnh->rtnh_hops=255;
+			debug(DBG_NORMAL, "hops=%d is invalid. Using hops=255\n",
+				  nhop[i].hops);
+			rtnh->rtnh_hops = 255;
 		} else
 			rtnh->rtnh_hops = nhop[i].hops - 1;
 
@@ -169,20 +181,21 @@ int add_nexthops(struct nlmsghdr *n, struct rtmsg *r, struct nexthop *nhop)
  * route_exec: replaces, adds or deletes a route from the routing table.
  * `to' and nhops->gw must be addresses given in network order
  */
-int route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
-		inet_prefix *src, inet_prefix *to, struct nexthop *nhops, 
-		char *dev, u_char table)
+int
+route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
+		   inet_prefix * src, inet_prefix * to, struct nexthop *nhops,
+		   char *dev, u_char table)
 {
 	struct rt_request req;
 	struct rtnl_handle rth;
 
 	setzero(&req, sizeof(req));
 
-	if(!table)
-		table=RT_TABLE_MAIN;
+	if (!table)
+		table = RT_TABLE_MAIN;
 
 	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
-	req.nh.nlmsg_flags = NLM_F_REQUEST|flags;
+	req.nh.nlmsg_flags = NLM_F_REQUEST | flags;
 	req.nh.nlmsg_type = route_cmd;
 	req.rt.rtm_family = AF_UNSPEC;
 	req.rt.rtm_table = table;
@@ -191,27 +204,27 @@ int route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
 	req.rt.rtm_type = RTN_UNSPEC;
 
 	/* kernel protocol layer */
-	if(table == RT_TABLE_LOCAL)
+	if (table == RT_TABLE_LOCAL)
 		req.rt.rtm_protocol = RTPROT_KERNEL;
-	
+
 	if (route_cmd != RTM_DELROUTE) {
 		req.rt.rtm_scope = RT_SCOPE_UNIVERSE;
 		req.rt.rtm_type = RTN_UNICAST;
 	}
-	
-	if(route_type)
+
+	if (route_type)
 		req.rt.rtm_type = route_type;
 
-	if(route_scope)
+	if (route_scope)
 		req.rt.rtm_scope = route_scope;
-	else if(req.rt.rtm_type==RTN_LOCAL)
-		req.rt.rtm_scope=RT_SCOPE_HOST;
+	else if (req.rt.rtm_type == RTN_LOCAL)
+		req.rt.rtm_scope = RT_SCOPE_HOST;
+
 
-	
 	if (rtnl_open(&rth, 0) < 0)
 		return -1;
 
-	if (dev || nhops) 
+	if (dev || nhops)
 		ll_init_map(&rth);
 
 #ifdef LINUX_2_6_14
@@ -223,39 +236,40 @@ int route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
 		int idx;
 
 		if ((idx = ll_name_to_index(dev)) == 0) {
-			error("%s:%d, Device \"%s\" doesn't really exist\n", ERROR_POS, dev);
+			error("%s:%d, Device \"%s\" doesn't really exist\n", ERROR_POS,
+				  dev);
 			return -1;
 		}
 		addattr32(&req.nh, sizeof(req), RTA_OIF, idx);
 	}
 
-	if(to) {
+	if (to) {
 		req.rt.rtm_family = to->family;
 		req.rt.rtm_dst_len = to->bits;
 
-		if(!to->data[0] && !to->data[1] && !to->data[2] && !to->data[3]) {
-			/* Modify the default gw*/
-			if(route_cmd == RTM_DELROUTE)
-				req.rt.rtm_protocol=0;
+		if (!to->data[0] && !to->data[1] && !to->data[2] && !to->data[3]) {
+			/* Modify the default gw */
+			if (route_cmd == RTM_DELROUTE)
+				req.rt.rtm_protocol = 0;
 		}
 
-		if(to->len)		
+		if (to->len)
 			addattr_l(&req.nh, sizeof(req), RTA_DST, &to->data, to->len);
 	}
 
-	if(src) {
+	if (src) {
 		if (req.rt.rtm_family == AF_UNSPEC)
 			req.rt.rtm_family = src->family;
 		addattr_l(&req.nh, sizeof(req), RTA_PREFSRC, &src->data, src->len);
 	}
-	
-	if(nhops)
+
+	if (nhops)
 		add_nexthops(&req.nh, &req.rt, nhops);
-	
-        if (req.rt.rtm_family == AF_UNSPEC)
-                req.rt.rtm_family = AF_INET;
 
-	/*Finaly stage: <<Hey krnl, r u there?>>*/
+	if (req.rt.rtm_family == AF_UNSPEC)
+		req.rt.rtm_family = AF_INET;
+
+	/*Finaly stage: <<Hey krnl, r u there?>> */
 	if (rtnl_talk(&rth, &req.nh, 0, 0, NULL, NULL, NULL) < 0)
 		return -1;
 
@@ -271,11 +285,12 @@ int route_exec(int route_cmd, int route_type, int route_scope, unsigned flags,
  * The dev name of the route is appended at `arg'+sizeof(inet_prefix).
  * Only the non-deleted routes are considered.
  */
-int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int
+route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
 	struct rtmsg *r = NLMSG_DATA(n);
 	int len = n->nlmsg_len;
-	struct rtattr * tb[RTA_MAX+1];
+	struct rtattr *tb[RTA_MAX + 1];
 	inet_prefix dst;
 	inet_prefix via;
 	int host_len = -1;
@@ -301,10 +316,10 @@ int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	if (r->rtm_family == AF_INET6) {
 		if (filter.tb) {
 			if (filter.tb < 0) {
-				if (!(r->rtm_flags&RTM_F_CLONED))
+				if (!(r->rtm_flags & RTM_F_CLONED))
 					return 0;
 			} else {
-				if (r->rtm_flags&RTM_F_CLONED)
+				if (r->rtm_flags & RTM_F_CLONED)
 					return 0;
 				if (filter.tb == RT_TABLE_LOCAL) {
 					if (r->rtm_type != RTN_LOCAL)
@@ -321,27 +336,29 @@ int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 		if (filter.tb > 0 && filter.tb != r->rtm_table)
 			return 0;
 	}
-	if ((filter.protocol^r->rtm_protocol)&filter.protocolmask)
+	if ((filter.protocol ^ r->rtm_protocol) & filter.protocolmask)
 		return 0;
-	if ((filter.scope^r->rtm_scope)&filter.scopemask)
+	if ((filter.scope ^ r->rtm_scope) & filter.scopemask)
 		return 0;
-	if ((filter.type^r->rtm_type)&filter.typemask)
+	if ((filter.type ^ r->rtm_type) & filter.typemask)
 		return 0;
-	if ((filter.tos^r->rtm_tos)&filter.tosmask)
+	if ((filter.tos ^ r->rtm_tos) & filter.tosmask)
 		return 0;
 	if (filter.rdst.family &&
-			(r->rtm_family != filter.rdst.family || filter.rdst.bits > r->rtm_dst_len))
+		(r->rtm_family != filter.rdst.family
+		 || filter.rdst.bits > r->rtm_dst_len))
 		return 0;
 	if (filter.mdst.family &&
-			(r->rtm_family != filter.mdst.family ||
-			 (filter.mdst.bits < r->rtm_dst_len)))
+		(r->rtm_family != filter.mdst.family ||
+		 (filter.mdst.bits < r->rtm_dst_len)))
 		return 0;
 	if (filter.rsrc.family &&
-			(r->rtm_family != filter.rsrc.family || filter.rsrc.bits > r->rtm_src_len))
+		(r->rtm_family != filter.rsrc.family
+		 || filter.rsrc.bits > r->rtm_src_len))
 		return 0;
 	if (filter.msrc.family &&
-			(r->rtm_family != filter.msrc.family ||
-			 (filter.msrc.bits < r->rtm_src_len)))
+		(r->rtm_family != filter.msrc.family ||
+		 (filter.msrc.bits < r->rtm_src_len)))
 		return 0;
 	if (filter.rvia.family && r->rtm_family != filter.rvia.family)
 		return 0;
@@ -353,12 +370,13 @@ int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	setzero(&dst, sizeof(dst));
 	dst.family = r->rtm_family;
 	if (tb[RTA_DST]) {
-		memcpy(&dst.data, RTA_DATA(tb[RTA_DST]), (r->rtm_dst_len+7)/8);
+		memcpy(&dst.data, RTA_DATA(tb[RTA_DST]), (r->rtm_dst_len + 7) / 8);
 	}
-	if (filter.rdst.family && inet_addr_match(&dst, &filter.rdst, filter.rdst.bits))
+	if (filter.rdst.family
+		&& inet_addr_match(&dst, &filter.rdst, filter.rdst.bits))
 		return 0;
 	if (filter.mdst.family &&
-			inet_addr_match(&dst, &filter.mdst, r->rtm_dst_len))
+		inet_addr_match(&dst, &filter.mdst, r->rtm_dst_len))
 		return 0;
 
 	if (n->nlmsg_type == RTM_DELROUTE)
@@ -367,11 +385,11 @@ int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	/*
 	 * ... and finally if all the tests passed, copy the gateway address
 	 */
-	if(tb[RTA_GATEWAY]) {
-		memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len/8);
-		via.family=r->rtm_family;
-		inet_setip(arg, (u_int *)&via.data, via.family);
-	} else if(tb[RTA_MULTIPATH]) {
+	if (tb[RTA_GATEWAY]) {
+		memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len / 8);
+		via.family = r->rtm_family;
+		inet_setip(arg, (u_int *) & via.data, via.family);
+	} else if (tb[RTA_MULTIPATH]) {
 		struct rtnexthop *nh = RTA_DATA(tb[RTA_MULTIPATH]);
 
 		len = RTA_PAYLOAD(tb[RTA_MULTIPATH]);
@@ -381,23 +399,26 @@ int route_get_gw(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 				break;
 			if (nh->rtnh_len > len)
 				break;
-			if (r->rtm_flags&RTM_F_CLONED && r->rtm_type == RTN_MULTICAST)
+			if (r->rtm_flags & RTM_F_CLONED
+				&& r->rtm_type == RTN_MULTICAST)
 				goto skip_nexthop;
 
 			if (nh->rtnh_len > sizeof(*nh)) {
-				parse_rtattr(tb, RTA_MAX, RTNH_DATA(nh), nh->rtnh_len - sizeof(*nh));
+				parse_rtattr(tb, RTA_MAX, RTNH_DATA(nh),
+							 nh->rtnh_len - sizeof(*nh));
 				if (tb[RTA_GATEWAY]) {
-					memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]), host_len/8);
-					via.family=r->rtm_family;
-					inet_setip(arg, (u_int *)&via.data, via.family);
+					memcpy(&via.data, RTA_DATA(tb[RTA_GATEWAY]),
+						   host_len / 8);
+					via.family = r->rtm_family;
+					inet_setip(arg, (u_int *) & via.data, via.family);
 
 					/* Copy the interface name */
-					strncpy((char *)arg+sizeof(inet_prefix),
-						ll_index_to_name(nh->rtnh_ifindex), IFNAMSIZ);
+					strncpy((char *) arg + sizeof(inet_prefix),
+							ll_index_to_name(nh->rtnh_ifindex), IFNAMSIZ);
 					break;
 				}
 			}
-skip_nexthop:
+		  skip_nexthop:
 			len -= NLMSG_ALIGN(nh->rtnh_len);
 			nh = RTNH_NEXT(nh);
 		}
@@ -406,9 +427,10 @@ skip_nexthop:
 
 	/* Copy the interface name */
 	if (tb[RTA_OIF] && filter.oifmask != -1)
-		strncpy((char *)arg+sizeof(inet_prefix),
-			ll_index_to_name(*(int*)RTA_DATA(tb[RTA_OIF])), IFNAMSIZ);
-	
+		strncpy((char *) arg + sizeof(inet_prefix),
+				ll_index_to_name(*(int *) RTA_DATA(tb[RTA_OIF])),
+				IFNAMSIZ);
+
 	return 0;
 }
 
@@ -418,8 +440,9 @@ skip_nexthop:
  * address is stored in `dst' and its interface name in `dev_name' (which must
  * be IFNAMSIZ big).
  */
-int route_get_exact_prefix_dst(inet_prefix prefix, inet_prefix *dst, 
-		char *dev_name)
+int
+route_get_exact_prefix_dst(inet_prefix prefix, inet_prefix * dst,
+						   char *dev_name)
 {
 	int do_ipv6 = AF_UNSPEC;
 	struct rtnl_handle rth;
@@ -428,7 +451,7 @@ int route_get_exact_prefix_dst(inet_prefix prefix, inet_prefix *dst,
 	route_reset_filter();
 	filter.tb = RT_TABLE_MAIN;
 
-	filter.mdst=prefix;
+	filter.mdst = prefix;
 	filter.rdst = filter.mdst;
 
 	if (do_ipv6 == AF_UNSPEC && filter.tb)
@@ -440,7 +463,7 @@ int route_get_exact_prefix_dst(inet_prefix prefix, inet_prefix *dst,
 	ll_init_map(&rth);
 
 	if (rtnl_wilddump_request(&rth, do_ipv6, RTM_GETROUTE) < 0) {
-		error(ERROR_MSG"Cannot send dump request"ERROR_POS);
+		error(ERROR_MSG "Cannot send dump request" ERROR_POS);
 		return -1;
 	}
 
@@ -449,40 +472,42 @@ int route_get_exact_prefix_dst(inet_prefix prefix, inet_prefix *dst,
 		debug(DBG_NORMAL, ERROR_MSG "Dump terminated" ERROR_POS);
 		return -1;
 	}
-	inet_copy(dst, (inet_prefix *)dst_data);
-	memcpy(dev_name, dst_data+sizeof(inet_prefix), IFNAMSIZ);
-	
+	inet_copy(dst, (inet_prefix *) dst_data);
+	memcpy(dev_name, dst_data + sizeof(inet_prefix), IFNAMSIZ);
+
 	rtnl_close(&rth);
 
 	return 0;
 }
 
-int route_flush_cache(int family)
+int
+route_flush_cache(int family)
 {
 	int len, err;
 	int flush_fd;
-	char ROUTE_FLUSH_SYSCTL[]="/proc/sys/net/ipvX/route/flush";
+	char ROUTE_FLUSH_SYSCTL[] = "/proc/sys/net/ipvX/route/flush";
 	char *buf = "-1";
 
 	len = strlen(buf);
-	if(family==AF_INET)
-		ROUTE_FLUSH_SYSCTL[17]='4';
-	else if(family==AF_INET6)
-		ROUTE_FLUSH_SYSCTL[17]='6';
+	if (family == AF_INET)
+		ROUTE_FLUSH_SYSCTL[17] = '4';
+	else if (family == AF_INET6)
+		ROUTE_FLUSH_SYSCTL[17] = '6';
 	else
 		return -1;
 
-	flush_fd=open(ROUTE_FLUSH_SYSCTL, O_WRONLY);
+	flush_fd = open(ROUTE_FLUSH_SYSCTL, O_WRONLY);
 	if (flush_fd < 0) {
 		debug(DBG_NORMAL, "Cannot open \"%s\"\n", ROUTE_FLUSH_SYSCTL);
 		return -1;
 	}
-		
-	if ((err=write (flush_fd, (void *)buf, len)) == 0) {
+
+	if ((err = write(flush_fd, (void *) buf, len)) == 0) {
 		debug(DBG_NORMAL, "Warning: Route Cache not flushed\n");
 		return -1;
-	} else if(err==-1) {
-		debug(DBG_NORMAL, "Cannot flush routing cache: %s\n", strerror(errno));
+	} else if (err == -1) {
+		debug(DBG_NORMAL, "Cannot flush routing cache: %s\n",
+			  strerror(errno));
 		return -1;
 	}
 	close(flush_fd);
@@ -490,39 +515,42 @@ int route_flush_cache(int family)
 	return 0;
 }
 
-int route_ip_forward(int family, int enable)
+int
+route_ip_forward(int family, int enable)
 {
 	int len, err;
 	int flush_fd;
-	char *ROUTE_FORWARD_SYSCTL="/proc/sys/net/ipv4/ip_forward";
-	char *ROUTE_FORWARD_SYSCTL_6="/proc/sys/net/ipv6/conf/all/forwarding";
+	char *ROUTE_FORWARD_SYSCTL = "/proc/sys/net/ipv4/ip_forward";
+	char *ROUTE_FORWARD_SYSCTL_6 =
+		"/proc/sys/net/ipv6/conf/all/forwarding";
 	char *sysctl_path, buf[2];
 
-	buf[0]='1';
-	buf[1]=0;
-	
+	buf[0] = '1';
+	buf[1] = 0;
+
 	len = strlen(buf);
-	if(family==AF_INET)
+	if (family == AF_INET)
 		sysctl_path = ROUTE_FORWARD_SYSCTL;
-	else if(family==AF_INET6)
+	else if (family == AF_INET6)
 		sysctl_path = ROUTE_FORWARD_SYSCTL_6;
 	else
 		return -1;
 
-	if(!enable)
-		buf[0]='0';
+	if (!enable)
+		buf[0] = '0';
 
-	flush_fd=open(sysctl_path, O_WRONLY);
+	flush_fd = open(sysctl_path, O_WRONLY);
 	if (flush_fd < 0) {
 		debug(DBG_NORMAL, "Cannot open \"%s\"\n", sysctl_path);
 		return -1;
 	}
-		
-	if ((err=write (flush_fd, (void *)buf, len)) == 0) {
+
+	if ((err = write(flush_fd, (void *) buf, len)) == 0) {
 		debug(DBG_NORMAL, "Warning: ip_forward setting changed\n");
 		return -1;
-	} else if(err==-1) {
-		debug(DBG_NORMAL, "Cannot change the ip_forward setting: %s\n", strerror(errno));
+	} else if (err == -1) {
+		debug(DBG_NORMAL, "Cannot change the ip_forward setting: %s\n",
+			  strerror(errno));
 		return -1;
 	}
 	close(flush_fd);
@@ -535,27 +563,28 @@ int route_ip_forward(int family, int enable)
  *
  * Modifies the /proc/sys/net/ipv4/conf/INTERFACE/rp_filter config file.
  */
-int route_rp_filter(int family, char *dev, int enable)
+int
+route_rp_filter(int family, char *dev, int enable)
 {
-	int len, err, ret=0;
+	int len, err, ret = 0;
 	int flush_fd;
-	
+
 	/* The path is /proc/sys/net/ipv4/conf/INTERFACE/rp_filter */
-	const char *RP_FILTER_SYSCTL_1="/proc/sys/net/ipv4/conf/";
-	const char *RP_FILTER_SYSCTL_1_IPV6="/proc/sys/net/ipv6/conf/";
-	const char *RP_FILTER_SYSCTL_2="/rp_filter";
-	char *final_path=0, buf[2];
+	const char *RP_FILTER_SYSCTL_1 = "/proc/sys/net/ipv4/conf/";
+	const char *RP_FILTER_SYSCTL_1_IPV6 = "/proc/sys/net/ipv6/conf/";
+	const char *RP_FILTER_SYSCTL_2 = "/rp_filter";
+	char *final_path = 0, buf[2];
 
-	buf[0]='1';
-	buf[1]=0;
+	buf[0] = '1';
+	buf[1] = 0;
 #define RP_FILTER_PATH_SZ (strlen(RP_FILTER_SYSCTL_1)+		   \
 			   strlen(RP_FILTER_SYSCTL_2)+IF_NAMESIZE+1)
-	final_path=xzalloc(RP_FILTER_PATH_SZ);
+	final_path = xzalloc(RP_FILTER_PATH_SZ);
 
 	len = strlen(buf);
-	if(family==AF_INET) {
+	if (family == AF_INET) {
 		strcpy(final_path, RP_FILTER_SYSCTL_1);
-	} else if(family==AF_INET6) {
+	} else if (family == AF_INET6) {
 		strcpy(final_path, RP_FILTER_SYSCTL_1_IPV6);
 	} else
 		ERROR_FINISH(ret, -1, finish);
@@ -563,26 +592,27 @@ int route_rp_filter(int family, char *dev, int enable)
 	strcat(final_path, dev);
 	strcat(final_path, RP_FILTER_SYSCTL_2);
 
-	if(!enable)
-		buf[0]='0';
+	if (!enable)
+		buf[0] = '0';
 
-	flush_fd=open(final_path, O_WRONLY);
+	flush_fd = open(final_path, O_WRONLY);
 	if (flush_fd < 0) {
 		debug(DBG_NORMAL, "Cannot open \"%s\"\n", final_path);
 		ERROR_FINISH(ret, -1, finish);
 	}
-		
-	if ((err=write (flush_fd, (void *)buf, len)) == 0) {
+
+	if ((err = write(flush_fd, (void *) buf, len)) == 0) {
 		debug(DBG_NORMAL, "Warning: rp_filter setting changed\n");
 		ERROR_FINISH(ret, -1, finish);
-	} else if(err==-1) {
-		debug(DBG_NORMAL, "Cannot change the rp_filter setting: %s\n", strerror(errno));
+	} else if (err == -1) {
+		debug(DBG_NORMAL, "Cannot change the rp_filter setting: %s\n",
+			  strerror(errno));
 		ERROR_FINISH(ret, -1, finish);
 	}
 	close(flush_fd);
 
-finish:
-	if(final_path)
+  finish:
+	if (final_path)
 		xfree(final_path);
 	return ret;
 }
@@ -591,12 +621,13 @@ finish:
  * route_rp_filter_all_dev: do route_rp_filter() for all the interfaces
  * present in the `ifs' array.
  */
-int route_rp_filter_all_dev(int family, interface *ifs, int ifs_n, int enable)
+int
+route_rp_filter_all_dev(int family, interface * ifs, int ifs_n, int enable)
 {
-	int i, ret=0;
+	int i, ret = 0;
 
-	for(i=0; i<ifs_n; i++)
-		ret+=route_rp_filter(family, ifs[i].dev_name, enable);
+	for (i = 0; i < ifs_n; i++)
+		ret += route_rp_filter(family, ifs[i].dev_name, enable);
 
 	return ret;
 }

src/krnl_route.h

@@ -23,17 +23,16 @@
 
 #define RTPROT_NETSUKUKU	15
 
-struct nexthop 
-{
+struct nexthop {
 	inet_prefix gw;
 	char *dev;
 	u_char hops;
 };
 
 struct rt_request {
-	struct nlmsghdr 	nh;
-	struct rtmsg 		rt;
-	char   			buf[1024];
+	struct nlmsghdr nh;
+	struct rtmsg rt;
+	char buf[1024];
 };
 
 
@@ -49,6 +48,7 @@ int route_get_exact_prefix_dst(inet_prefix, inet_prefix *, char *);
 int route_flush_cache(int family);
 int route_ip_forward(int family, int enable);
 int route_rp_filter(int family, char *dev, int enable);
-int route_rp_filter_all_dev(int family, interface *ifs, int ifs_n, int enable);
+int route_rp_filter_all_dev(int family, interface * ifs, int ifs_n,
+							int enable);
 
-#endif /*KRNL_ROUTE_H*/
+#endif							/*KRNL_ROUTE_H */

src/krnl_rule.c

@@ -28,45 +28,49 @@
 #include "krnl_rule.h"
 #include "common.h"
 
-int rule_exec(int rtm_cmd, inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table);
+int rule_exec(int rtm_cmd, inet_prefix * from, inet_prefix * to, char *dev,
+			  int prio, u_int fwmark, u_char table);
 
-int rule_add(inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table)
+int
+rule_add(inet_prefix * from, inet_prefix * to, char *dev,
+		 int prio, u_int fwmark, u_char table)
 {
 	return rule_exec(RTM_NEWRULE, from, to, dev, prio, fwmark, table);
 }
 
-int rule_del(inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table)
+int
+rule_del(inet_prefix * from, inet_prefix * to, char *dev,
+		 int prio, u_int fwmark, u_char table)
 {
 	return rule_exec(RTM_DELRULE, from, to, dev, prio, fwmark, table);
 }
 
-int rule_replace(inet_prefix *from, inet_prefix *to, char *dev,
-		int prio, u_int fwmark, u_char table)
+int
+rule_replace(inet_prefix * from, inet_prefix * to, char *dev,
+			 int prio, u_int fwmark, u_char table)
 {
 	rule_del(from, to, dev, prio, fwmark, table);
-	return	rule_add(from, to, dev, prio, fwmark, table);
+	return rule_add(from, to, dev, prio, fwmark, table);
 }
 
 /*
  * rule_exec:
  * `from' and `to' have to be in network order
  */
-int rule_exec(int rtm_cmd, inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table)
+int
+rule_exec(int rtm_cmd, inet_prefix * from, inet_prefix * to, char *dev,
+		  int prio, u_int fwmark, u_char table)
 {
 	struct {
-		struct nlmsghdr 	nh;
-		struct rtmsg 		rt;
-		char   			buf[1024];
+		struct nlmsghdr nh;
+		struct rtmsg rt;
+		char buf[1024];
 	} req;
 	struct rtnl_handle rth;
 
 	setzero(&req, sizeof(req));
 	table = !table ? RT_TABLE_MAIN : table;
-	
+
 	req.nh.nlmsg_type = rtm_cmd;
 	req.nh.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
 	req.nh.nlmsg_flags = NLM_F_REQUEST;
@@ -77,21 +81,21 @@ int rule_exec(int rtm_cmd, inet_prefix *from, inet_prefix *to, char *dev,
 	req.rt.rtm_table = table;
 
 	if (rtm_cmd == RTM_NEWRULE) {
-		req.nh.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
+		req.nh.nlmsg_flags |= NLM_F_CREATE | NLM_F_EXCL;
 		req.rt.rtm_type = RTN_UNICAST;
 	}
 
 	if (from) {
 		req.rt.rtm_src_len = from->bits;
 		addattr_l(&req.nh, sizeof(req), RTA_SRC, &from->data, from->len);
-		req.rt.rtm_family=from->family;
+		req.rt.rtm_family = from->family;
 	}
 
 	if (to) {
 		req.rt.rtm_dst_len = to->bits;
 		addattr_l(&req.nh, sizeof(req), RTA_DST, &to->data, to->len);
-		req.rt.rtm_family=to->family;
-	} 
+		req.rt.rtm_family = to->family;
+	}
 
 	if (prio)
 		addattr32(&req.nh, sizeof(req), RTA_PRIORITY, prio);
@@ -100,8 +104,8 @@ int rule_exec(int rtm_cmd, inet_prefix *from, inet_prefix *to, char *dev,
 		addattr32(&req.nh, sizeof(req), RTA_PROTOINFO, fwmark);
 
 	if (dev) {
-		addattr_l(&req.nh, sizeof(req), RTA_IIF, dev, strlen(dev)+1);
-	} 
+		addattr_l(&req.nh, sizeof(req), RTA_IIF, dev, strlen(dev) + 1);
+	}
 
 	if (req.rt.rtm_family == AF_UNSPEC)
 		req.rt.rtm_family = AF_INET;
@@ -121,62 +125,66 @@ int rule_exec(int rtm_cmd, inet_prefix *from, inet_prefix *to, char *dev,
  * rule_flush_table_range_filter: rtnl_dump filter for
  * rule_flush_table_range() (see below)
  */
-int rule_flush_table_range_filter(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int
+rule_flush_table_range_filter(const struct sockaddr_nl *who,
+							  struct nlmsghdr *n, void *arg)
 {
-        struct rtnl_handle rth2;
-        struct rtmsg *r = NLMSG_DATA(n);
-        int len = n->nlmsg_len;
-        struct rtattr *tb[RTA_MAX+1];
-	u_int a=*(u_int *)arg;
-	u_int b=*((u_int *)arg+1);
+	struct rtnl_handle rth2;
+	struct rtmsg *r = NLMSG_DATA(n);
+	int len = n->nlmsg_len;
+	struct rtattr *tb[RTA_MAX + 1];
+	u_int a = *(u_int *) arg;
+	u_int b = *((u_int *) arg + 1);
 
-        len -= NLMSG_LENGTH(sizeof(*r));
-        if (len < 0)
-                return -1;
+	len -= NLMSG_LENGTH(sizeof(*r));
+	if (len < 0)
+		return -1;
 
-        parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
+	parse_rtattr(tb, RTA_MAX, RTM_RTA(r), len);
 
-        if (tb[RTA_PRIORITY] && (r->rtm_table >= a && r->rtm_table <= b)) {
-                n->nlmsg_type = RTM_DELRULE;
-                n->nlmsg_flags = NLM_F_REQUEST;
+	if (tb[RTA_PRIORITY] && (r->rtm_table >= a && r->rtm_table <= b)) {
+		n->nlmsg_type = RTM_DELRULE;
+		n->nlmsg_flags = NLM_F_REQUEST;
 
-                if (rtnl_open(&rth2, 0) < 0)
-                        return -1;
+		if (rtnl_open(&rth2, 0) < 0)
+			return -1;
 
-                if (rtnl_talk(&rth2, n, 0, 0, NULL, NULL, NULL) < 0)
-                        return -2;
+		if (rtnl_talk(&rth2, n, 0, 0, NULL, NULL, NULL) < 0)
+			return -2;
 
-                rtnl_close(&rth2);
-        }
+		rtnl_close(&rth2);
+	}
 
-        return 0;
+	return 0;
 }
 
 /*
  * rule_flush_table_range: deletes all the rules which lookup the table X.
  * The table X is any table in the range of `a' <= X <= `b'.
  */
-int rule_flush_table_range(int family, int a, int b)
+int
+rule_flush_table_range(int family, int a, int b)
 {
 	struct rtnl_handle rth;
 	int arg[2];
-	
+
 	if (rtnl_open(&rth, 0) < 0)
 		return 1;
 
-        if (rtnl_wilddump_request(&rth, family, RTM_GETRULE) < 0) {
-                error("Cannot dump the routing rule table");
-                return -1;
-        }
-        
-	arg[0]=a;
-	arg[1]=b;
-        if (rtnl_dump_filter(&rth, rule_flush_table_range_filter, arg, NULL, NULL) < 0) {
-                error("Flush terminated");
-                return -1;
-        }
-	
+	if (rtnl_wilddump_request(&rth, family, RTM_GETRULE) < 0) {
+		error("Cannot dump the routing rule table");
+		return -1;
+	}
+
+	arg[0] = a;
+	arg[1] = b;
+	if (rtnl_dump_filter
+		(&rth, rule_flush_table_range_filter, arg, NULL, NULL) < 0) {
+		error("Flush terminated");
+		return -1;
+	}
+
 	rtnl_close(&rth);
-	
-        return 0;
+
+	return 0;
 }

src/krnl_rule.h

@@ -16,10 +16,10 @@
  * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-int rule_add(inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table);
-int rule_del(inet_prefix *from, inet_prefix *to, char *dev, 
-		int prio, u_int fwmark, u_char table);
-int rule_replace(inet_prefix *from, inet_prefix *to, char *dev,
-		int prio, u_int fwmark, u_char table);
+int rule_add(inet_prefix * from, inet_prefix * to, char *dev,
+			 int prio, u_int fwmark, u_char table);
+int rule_del(inet_prefix * from, inet_prefix * to, char *dev,
+			 int prio, u_int fwmark, u_char table);
+int rule_replace(inet_prefix * from, inet_prefix * to, char *dev,
+				 int prio, u_int fwmark, u_char table);
 int rule_flush_table_range(int family, int a, int b);

src/libiptc/ipt_conntrack.h

@@ -45,8 +45,7 @@
 #define IPT_CONNTRACK_EXPIRES	0x80
 
 /* This is exposed to userspace, so remains frozen in time. */
-struct ip_conntrack_old_tuple
-{
+struct ip_conntrack_old_tuple {
 	struct {
 		u_int32_t ip;
 		union {
@@ -65,8 +64,7 @@ struct ip_conntrack_old_tuple
 	} dst;
 };
 
-struct ipt_conntrack_info
-{
+struct ipt_conntrack_info {
 	unsigned int statemask, statusmask;
 
 	struct ip_conntrack_old_tuple tuple[IP_CT_DIR_MAX];

src/libiptc/iptables.h

@@ -12,28 +12,25 @@
 #define IPPROTO_SCTP 132
 #endif
 
-#ifndef IPT_SO_GET_REVISION_MATCH /* Old kernel source. */
+#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)
 
-struct ipt_get_revision
-{
-	char name[IPT_FUNCTION_MAXNAMELEN-1];
+struct ipt_get_revision {
+	char name[IPT_FUNCTION_MAXNAMELEN - 1];
 
 	u_int8_t revision;
 };
-#endif /* IPT_SO_GET_REVISION_MATCH   Old kernel source */
+#endif							/* IPT_SO_GET_REVISION_MATCH   Old kernel source */
 
-struct iptables_rule_match
-{
+struct iptables_rule_match {
 	struct iptables_rule_match *next;
 
 	struct iptables_match *match;
 };
 
 /* Include file for additions: new matches and targets. */
-struct iptables_match
-{
+struct iptables_match {
 	struct iptables_match *next;
 
 	ipt_chainlabel name;
@@ -50,28 +47,27 @@ struct iptables_match
 	size_t userspacesize;
 
 	/* Function which prints out usage message. */
-	void (*help)(void);
+	void (*help) (void);
 
 	/* Initialize the match. */
-	void (*init)(struct ipt_entry_match *m, unsigned int *nfcache);
+	void (*init) (struct ipt_entry_match * m, unsigned int *nfcache);
 
 	/* Function which parses command options; returns true if it
-           ate an option */
-	int (*parse)(int c, char **argv, int invert, unsigned int *flags,
-		     const struct ipt_entry *entry,
-		     unsigned int *nfcache,
-		     struct ipt_entry_match **match);
+	   ate an option */
+	int (*parse) (int c, char **argv, int invert, unsigned int *flags,
+				  const struct ipt_entry * entry,
+				  unsigned int *nfcache, struct ipt_entry_match ** match);
 
 	/* Final check; exit if not ok. */
-	void (*final_check)(unsigned int flags);
+	void (*final_check) (unsigned int flags);
 
 	/* Prints out the match iff non-NULL: put space at end */
-	void (*print)(const struct ipt_ip *ip,
-		      const struct ipt_entry_match *match, int numeric);
+	void (*print) (const struct ipt_ip * ip,
+				   const struct ipt_entry_match * match, int numeric);
 
 	/* Saves the match info in parsable form to stdout. */
-	void (*save)(const struct ipt_ip *ip,
-		     const struct ipt_entry_match *match);
+	void (*save) (const struct ipt_ip * ip,
+				  const struct ipt_entry_match * match);
 
 	/* Pointer to list of extra command-line options */
 	const struct option *extra_opts;
@@ -81,12 +77,11 @@ struct iptables_match
 	struct ipt_entry_match *m;
 	unsigned int mflags;
 #ifdef NO_SHARED_LIBS
-	unsigned int loaded; /* simulate loading so options are merged properly */
+	unsigned int loaded;		/* simulate loading so options are merged properly */
 #endif
 };
 
-struct iptables_target
-{
+struct iptables_target {
 	struct iptables_target *next;
 
 	ipt_chainlabel name;
@@ -103,27 +98,27 @@ struct iptables_target
 	size_t userspacesize;
 
 	/* Function which prints out usage message. */
-	void (*help)(void);
+	void (*help) (void);
 
 	/* Initialize the target. */
-	void (*init)(struct ipt_entry_target *t, unsigned int *nfcache);
+	void (*init) (struct ipt_entry_target * t, unsigned int *nfcache);
 
 	/* Function which parses command options; returns true if it
-           ate an option */
-	int (*parse)(int c, char **argv, int invert, unsigned int *flags,
-		     const struct ipt_entry *entry,
-		     struct ipt_entry_target **target);
+	   ate an option */
+	int (*parse) (int c, char **argv, int invert, unsigned int *flags,
+				  const struct ipt_entry * entry,
+				  struct ipt_entry_target ** target);
 
 	/* Final check; exit if not ok. */
-	void (*final_check)(unsigned int flags);
+	void (*final_check) (unsigned int flags);
 
 	/* Prints out the target iff non-NULL: put space at end */
-	void (*print)(const struct ipt_ip *ip,
-		      const struct ipt_entry_target *target, int numeric);
+	void (*print) (const struct ipt_ip * ip,
+				   const struct ipt_entry_target * target, int numeric);
 
 	/* Saves the targinfo in parsable form to stdout. */
-	void (*save)(const struct ipt_ip *ip,
-		     const struct ipt_entry_target *target);
+	void (*save) (const struct ipt_ip * ip,
+				  const struct ipt_entry_target * target);
 
 	/* Pointer to list of extra command-line options */
 	struct option *extra_opts;
@@ -134,7 +129,7 @@ struct iptables_target
 	unsigned int tflags;
 	unsigned int used;
 #ifdef NO_SHARED_LIBS
-	unsigned int loaded; /* simulate loading so options are merged properly */
+	unsigned int loaded;		/* simulate loading so options are merged properly */
 #endif
 };
 
@@ -149,13 +144,16 @@ extern char *addr_to_dotted(const struct in_addr *addrp);
 extern char *addr_to_anyname(const struct in_addr *addr);
 extern char *mask_to_dotted(const struct in_addr *mask);
 
-extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp,
-                      struct in_addr *maskp, unsigned int *naddrs);
+extern void parse_hostnetworkmask(const char *name,
+								  struct in_addr **addrpp,
+								  struct in_addr *maskp,
+								  unsigned int *naddrs);
 extern u_int16_t parse_protocol(const char *s);
-extern void parse_interface(const char *arg, char *vianame, unsigned char *mask);
+extern void parse_interface(const char *arg, char *vianame,
+							unsigned char *mask);
 
 extern int do_command(int argc, char *argv[], char **table,
-		      iptc_handle_t *handle);
+					  iptc_handle_t * handle);
 /* Keeping track of external matches and targets: linked lists.  */
 extern struct iptables_match *iptables_matches;
 extern struct iptables_target *iptables_targets;
@@ -166,15 +164,20 @@ enum ipt_tryload {
 	LOAD_MUST_SUCCEED
 };
 
-extern struct iptables_target *find_target(const char *name, enum ipt_tryload);
-extern struct iptables_match *find_match(const char *name, enum ipt_tryload, struct iptables_rule_match **match);
+extern struct iptables_target *find_target(const char *name,
+										   enum ipt_tryload);
+extern struct iptables_match *find_match(const char *name,
+										 enum ipt_tryload,
+										 struct iptables_rule_match
+										 **match);
 
 extern int delete_chain(const ipt_chainlabel chain, int verbose,
-			iptc_handle_t *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);
+						iptc_handle_t * 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);
 
 /* kernel revision handling */
 extern int kernel_version;

src/libiptc/libip4tc.c

@@ -175,37 +175,37 @@ dump_entry(STRUCT_ENTRY *e, const TC_HANDLE_T handle)
 }*/
 
 static unsigned char *
-is_same(const STRUCT_ENTRY *a, const STRUCT_ENTRY *b, unsigned char *matchmask)
+is_same(const STRUCT_ENTRY * a, const STRUCT_ENTRY * b,
+		unsigned char *matchmask)
 {
 	unsigned int i;
 	unsigned char *mptr;
 
 	/* Always compare head structures: ignore mask here. */
 	if (a->ip.src.s_addr != b->ip.src.s_addr
-	    || a->ip.dst.s_addr != b->ip.dst.s_addr
-	    || a->ip.smsk.s_addr != b->ip.smsk.s_addr
-	    || a->ip.dmsk.s_addr != b->ip.dmsk.s_addr
-	    || a->ip.proto != b->ip.proto
-	    || a->ip.flags != b->ip.flags
-	    || a->ip.invflags != b->ip.invflags)
+		|| a->ip.dst.s_addr != b->ip.dst.s_addr
+		|| a->ip.smsk.s_addr != b->ip.smsk.s_addr
+		|| a->ip.dmsk.s_addr != b->ip.dmsk.s_addr
+		|| a->ip.proto != b->ip.proto
+		|| a->ip.flags != b->ip.flags || a->ip.invflags != b->ip.invflags)
 		return NULL;
 
 	for (i = 0; i < IFNAMSIZ; i++) {
 		if (a->ip.iniface_mask[i] != b->ip.iniface_mask[i])
 			return NULL;
 		if ((a->ip.iniface[i] & a->ip.iniface_mask[i])
-		    != (b->ip.iniface[i] & b->ip.iniface_mask[i]))
+			!= (b->ip.iniface[i] & b->ip.iniface_mask[i]))
 			return NULL;
 		if (a->ip.outiface_mask[i] != b->ip.outiface_mask[i])
 			return NULL;
 		if ((a->ip.outiface[i] & a->ip.outiface_mask[i])
-		    != (b->ip.outiface[i] & b->ip.outiface_mask[i]))
+			!= (b->ip.outiface[i] & b->ip.outiface_mask[i]))
 			return NULL;
 	}
 
 	if (a->nfcache != b->nfcache
-	    || a->target_offset != b->target_offset
-	    || a->next_offset != b->next_offset)
+		|| a->target_offset != b->target_offset
+		|| a->next_offset != b->next_offset)
 		return NULL;
 
 	mptr = matchmask + sizeof(STRUCT_ENTRY);
@@ -223,15 +223,15 @@ unconditional(const struct ipt_ip *ip)
 {
 	unsigned int i;
 
-	for (i = 0; i < sizeof(*ip)/sizeof(u_int32_t); i++)
-		if (((u_int32_t *)ip)[i])
+	for (i = 0; i < sizeof(*ip) / sizeof(u_int32_t); i++)
+		if (((u_int32_t *) ip)[i])
 			return 0;
 
 	return 1;
 }
 
 static inline int
-check_match(const STRUCT_ENTRY_MATCH *m, unsigned int *off)
+check_match(const STRUCT_ENTRY_MATCH * m, unsigned int *off)
 {
 	assert(m->u.match_size >= sizeof(STRUCT_ENTRY_MATCH));
 	assert(ALIGN(m->u.match_size) == m->u.match_size);
@@ -241,23 +241,22 @@ check_match(const STRUCT_ENTRY_MATCH *m, unsigned int *off)
 }
 
 static inline int
-check_entry(const STRUCT_ENTRY *e, unsigned int *i, unsigned int *off,
-	    unsigned int user_offset, int *was_return,
-	    TC_HANDLE_T h)
+check_entry(const STRUCT_ENTRY * e, unsigned int *i, unsigned int *off,
+			unsigned int user_offset, int *was_return, TC_HANDLE_T h)
 {
 	unsigned int toff;
 	STRUCT_STANDARD_TARGET *t;
 
 	assert(e->target_offset >= sizeof(STRUCT_ENTRY));
 	assert(e->next_offset >= e->target_offset
-	       + sizeof(STRUCT_ENTRY_TARGET));
+		   + sizeof(STRUCT_ENTRY_TARGET));
 	toff = sizeof(STRUCT_ENTRY);
 	IPT_MATCH_ITERATE(e, check_match, &toff);
 
 	assert(toff == e->target_offset);
 
 	t = (STRUCT_STANDARD_TARGET *)
-		GET_TARGET((STRUCT_ENTRY *)e);
+		GET_TARGET((STRUCT_ENTRY *) e);
 	/* next_offset will have to be multiple of entry alignment. */
 	assert(e->next_offset == ALIGN(e->next_offset));
 	assert(e->target_offset == ALIGN(e->target_offset));
@@ -266,47 +265,45 @@ check_entry(const STRUCT_ENTRY *e, unsigned int *i, unsigned int *off,
 
 	if (strcmp(t->target.u.user.name, STANDARD_TARGET) == 0) {
 		assert(t->target.u.target_size
-		       == ALIGN(sizeof(STRUCT_STANDARD_TARGET)));
+			   == ALIGN(sizeof(STRUCT_STANDARD_TARGET)));
 
-		assert(t->verdict == -NF_DROP-1
-		       || t->verdict == -NF_ACCEPT-1
-		       || t->verdict == RETURN
-		       || t->verdict < (int)h->entries->size);
+		assert(t->verdict == -NF_DROP - 1
+			   || t->verdict == -NF_ACCEPT - 1
+			   || t->verdict == RETURN
+			   || t->verdict < (int) h->entries->size);
 
 		if (t->verdict >= 0) {
 			STRUCT_ENTRY *te = get_entry(h, t->verdict);
 			int idx;
 
 			idx = iptcb_entry2index(h, te);
-			assert(strcmp(GET_TARGET(te)->u.user.name,
-				      IPT_ERROR_TARGET)
-			       != 0);
+			assert(strcmp(GET_TARGET(te)->u.user.name, IPT_ERROR_TARGET)
+				   != 0);
 			assert(te != e);
 
 			/* Prior node must be error node, or this node. */
-			assert(t->verdict == iptcb_entry2offset(h, e)+e->next_offset
-			       || strcmp(GET_TARGET(index2entry(h, idx-1))
-					 ->u.user.name, IPT_ERROR_TARGET)
-			       == 0);
+			assert(t->verdict == iptcb_entry2offset(h, e) + e->next_offset
+				   || strcmp(GET_TARGET(index2entry(h, idx - 1))
+							 ->u.user.name, IPT_ERROR_TARGET)
+				   == 0);
 		}
 
-		if (t->verdict == RETURN
-		    && unconditional(&e->ip)
-		    && e->target_offset == sizeof(*e))
+		if (t->verdict == RETURN && unconditional(&e->ip)
+			&& e->target_offset == sizeof(*e))
 			*was_return = 1;
 		else
 			*was_return = 0;
 	} else if (strcmp(t->target.u.user.name, IPT_ERROR_TARGET) == 0) {
 		assert(t->target.u.target_size
-		       == ALIGN(sizeof(struct ipt_error_target)));
+			   == ALIGN(sizeof(struct ipt_error_target)));
 
 		/* If this is in user area, previous must have been return */
 		if (*off > user_offset)
 			assert(*was_return);
 
 		*was_return = 0;
-	}
-	else *was_return = 0;
+	} else
+		*was_return = 0;
 
 	if (*off == user_offset)
 		assert(strcmp(t->target.u.user.name, IPT_ERROR_TARGET) == 0);
@@ -322,15 +319,14 @@ static void
 do_check(TC_HANDLE_T h, unsigned int line)
 {
 	unsigned int i, n;
-	unsigned int user_offset; /* Offset of first user chain */
+	unsigned int user_offset;	/* Offset of first user chain */
 	int was_return;
 
 	assert(h->changed == 0 || h->changed == 1);
 	if (strcmp(h->info.name, "filter") == 0) {
 		assert(h->info.valid_hooks
-		       == (1 << NF_IP_LOCAL_IN
-			   | 1 << NF_IP_FORWARD
-			   | 1 << NF_IP_LOCAL_OUT));
+			   == (1 << NF_IP_LOCAL_IN
+				   | 1 << NF_IP_FORWARD | 1 << NF_IP_LOCAL_OUT));
 
 		/* Hooks should be first three */
 		assert(h->info.hook_entry[NF_IP_LOCAL_IN] == 0);
@@ -346,14 +342,13 @@ do_check(TC_HANDLE_T h, unsigned int line)
 		user_offset = h->info.hook_entry[NF_IP_LOCAL_OUT];
 	} else if (strcmp(h->info.name, "nat") == 0) {
 		assert((h->info.valid_hooks
-		        == (1 << NF_IP_PRE_ROUTING
-			    | 1 << NF_IP_POST_ROUTING
-			    | 1 << NF_IP_LOCAL_OUT)) ||
-		       (h->info.valid_hooks
-			== (1 << NF_IP_PRE_ROUTING
-			    | 1 << NF_IP_LOCAL_IN
-			    | 1 << NF_IP_POST_ROUTING
-			    | 1 << NF_IP_LOCAL_OUT)));
+				== (1 << NF_IP_PRE_ROUTING
+					| 1 << NF_IP_POST_ROUTING
+					| 1 << NF_IP_LOCAL_OUT)) ||
+			   (h->info.valid_hooks
+				== (1 << NF_IP_PRE_ROUTING
+					| 1 << NF_IP_LOCAL_IN
+					| 1 << NF_IP_POST_ROUTING | 1 << NF_IP_LOCAL_OUT)));
 
 		assert(h->info.hook_entry[NF_IP_PRE_ROUTING] == 0);
 
@@ -379,14 +374,13 @@ do_check(TC_HANDLE_T h, unsigned int line)
 		 * two mangle hooks, linux >= 2.4.18-pre6 has five mangle hooks
 		 * */
 		assert((h->info.valid_hooks
-			== (1 << NF_IP_PRE_ROUTING
-			    | 1 << NF_IP_LOCAL_OUT)) || 
-		       (h->info.valid_hooks
-			== (1 << NF_IP_PRE_ROUTING
-			    | 1 << NF_IP_LOCAL_IN
-			    | 1 << NF_IP_FORWARD
-			    | 1 << NF_IP_LOCAL_OUT
-			    | 1 << NF_IP_POST_ROUTING)));
+				== (1 << NF_IP_PRE_ROUTING
+					| 1 << NF_IP_LOCAL_OUT)) ||
+			   (h->info.valid_hooks
+				== (1 << NF_IP_PRE_ROUTING
+					| 1 << NF_IP_LOCAL_IN
+					| 1 << NF_IP_FORWARD
+					| 1 << NF_IP_LOCAL_OUT | 1 << NF_IP_POST_ROUTING)));
 
 		/* Hooks should be first five */
 		assert(h->info.hook_entry[NF_IP_PRE_ROUTING] == 0);
@@ -417,8 +411,7 @@ do_check(TC_HANDLE_T h, unsigned int line)
 		}
 	} else if (strcmp(h->info.name, "raw") == 0) {
 		assert(h->info.valid_hooks
-		       == (1 << NF_IP_PRE_ROUTING
-			   | 1 << NF_IP_LOCAL_OUT));
+			   == (1 << NF_IP_PRE_ROUTING | 1 << NF_IP_LOCAL_OUT));
 
 		/* Hooks should be first three */
 		assert(h->info.hook_entry[NF_IP_PRE_ROUTING] == 0);
@@ -447,7 +440,7 @@ do_check(TC_HANDLE_T h, unsigned int line)
 	user_offset += get_entry(h, user_offset)->next_offset;
 
 	/* Overflows should be end of entry chains, and unconditional
-           policy nodes. */
+	   policy nodes. */
 	for (i = 0; i < NUMHOOKS; i++) {
 		STRUCT_ENTRY *e;
 		STRUCT_STANDARD_TARGET *t;
@@ -455,47 +448,48 @@ do_check(TC_HANDLE_T h, unsigned int line)
 		if (!(h->info.valid_hooks & (1 << i)))
 			continue;
 		assert(h->info.underflow[i]
-		       == get_chain_end(h, h->info.hook_entry[i]));
+			   == get_chain_end(h, h->info.hook_entry[i]));
 
 		e = get_entry(h, get_chain_end(h, h->info.hook_entry[i]));
 		assert(unconditional(&e->ip));
 		assert(e->target_offset == sizeof(*e));
-		t = (STRUCT_STANDARD_TARGET *)GET_TARGET(e);
+		t = (STRUCT_STANDARD_TARGET *) GET_TARGET(e);
 		assert(t->target.u.target_size == ALIGN(sizeof(*t)));
 		assert(e->next_offset == sizeof(*e) + ALIGN(sizeof(*t)));
 
-		assert(strcmp(t->target.u.user.name, STANDARD_TARGET)==0);
-		assert(t->verdict == -NF_DROP-1 || t->verdict == -NF_ACCEPT-1);
+		assert(strcmp(t->target.u.user.name, STANDARD_TARGET) == 0);
+		assert(t->verdict == -NF_DROP - 1 || t->verdict == -NF_ACCEPT - 1);
 
 		/* Hooks and underflows must be valid entries */
 		entry2index(h, get_entry(h, h->info.hook_entry[i]));
 		entry2index(h, get_entry(h, h->info.underflow[i]));
 	}
 
-	assert(h->info.size
-	       >= h->info.num_entries * (sizeof(STRUCT_ENTRY)
-					 +sizeof(STRUCT_STANDARD_TARGET)));
+	assert(h->info.size >= h->info.num_entries * (sizeof(STRUCT_ENTRY)
+												  +
+												  sizeof
+												  (STRUCT_STANDARD_TARGET)));
 
-	assert(h->entries.size
-	       >= (h->new_number
-		   * (sizeof(STRUCT_ENTRY)
-		      + sizeof(STRUCT_STANDARD_TARGET))));
+	assert(h->entries.size >= (h->new_number * (sizeof(STRUCT_ENTRY)
+												+
+												sizeof
+												(STRUCT_STANDARD_TARGET))));
 	assert(strcmp(h->info.name, h->entries.name) == 0);
 
-	i = 0; n = 0;
+	i = 0;
+	n = 0;
 	was_return = 0;
 	/* Check all the entries. */
 	ENTRY_ITERATE(h->entries.entrytable, h->entries.size,
-		      check_entry, &i, &n, user_offset, &was_return, h);
+				  check_entry, &i, &n, user_offset, &was_return, h);
 
 	assert(i == h->new_number);
 	assert(n == h->entries.size);
 
 	/* Final entry must be error node */
-	assert(strcmp(GET_TARGET(index2entry(h, h->new_number-1))
-		      ->u.user.name,
-		      ERROR_TARGET) == 0);
+	assert(strcmp(GET_TARGET(index2entry(h, h->new_number - 1))
+				  ->u.user.name, ERROR_TARGET) == 0);
 }
-#endif /*IPTC_DEBUG*/
+#endif							/*IPTC_DEBUG */
 
 #endif

src/libiptc/libiptc.h

@@ -13,7 +13,7 @@
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <sys/types.h>
-#else /* libc5 */
+#else							/* libc5 */
 #include <sys/socket.h>
 #include <linux/ip.h>
 #include <linux/in.h>
@@ -40,7 +40,7 @@ extern "C" {
 
 #define IPT_ALIGN(s) (((s) + ((IPT_MIN_ALIGN)-1)) & ~((IPT_MIN_ALIGN)-1))
 
-typedef char ipt_chainlabel[32];
+	typedef char ipt_chainlabel[32];
 
 #define IPTC_LABEL_ACCEPT  "ACCEPT"
 #define IPTC_LABEL_DROP    "DROP"
@@ -48,141 +48,136 @@ typedef char ipt_chainlabel[32];
 #define IPTC_LABEL_RETURN  "RETURN"
 
 /* Transparent handle type. */
-typedef struct iptc_handle *iptc_handle_t;
+	typedef struct iptc_handle *iptc_handle_t;
 
 /* Does this chain exist? */
-int iptc_is_chain(const char *chain, const iptc_handle_t handle);
+	int iptc_is_chain(const char *chain, const iptc_handle_t handle);
 
 /* Take a snapshot of the rules.  Returns NULL on error. */
-iptc_handle_t iptc_init(const char *tablename);
+	iptc_handle_t iptc_init(const char *tablename);
 
 /* Cleanup after iptc_init(). */
-void iptc_free(iptc_handle_t *h);
+	void iptc_free(iptc_handle_t * h);
 
 /* Iterator functions to run through the chains.  Returns NULL at end. */
-const char *iptc_first_chain(iptc_handle_t *handle);
-const char *iptc_next_chain(iptc_handle_t *handle);
+	const char *iptc_first_chain(iptc_handle_t * handle);
+	const char *iptc_next_chain(iptc_handle_t * handle);
 
 /* Get first rule in the given chain: NULL for empty chain. */
-const struct ipt_entry *iptc_first_rule(const char *chain,
-					iptc_handle_t *handle);
+	const struct ipt_entry *iptc_first_rule(const char *chain,
+											iptc_handle_t * handle);
 
 /* Returns NULL when rules run out. */
-const struct ipt_entry *iptc_next_rule(const struct ipt_entry *prev,
-				       iptc_handle_t *handle);
+	const struct ipt_entry *iptc_next_rule(const struct ipt_entry *prev,
+										   iptc_handle_t * handle);
 
 /* Returns a pointer to the target name of this entry. */
-const char *iptc_get_target(const struct ipt_entry *e,
-			    iptc_handle_t *handle);
+	const char *iptc_get_target(const struct ipt_entry *e,
+								iptc_handle_t * handle);
 
 /* Is this a built-in chain? */
-int iptc_builtin(const char *chain, const iptc_handle_t handle);
+	int iptc_builtin(const char *chain, const iptc_handle_t handle);
 
 /* Get the policy of a given built-in chain */
-const char *iptc_get_policy(const char *chain,
-			    struct ipt_counters *counter,
-			    iptc_handle_t *handle);
+	const char *iptc_get_policy(const char *chain,
+								struct ipt_counters *counter,
+								iptc_handle_t * handle);
 
 /* These functions return TRUE for OK or 0 and set errno.  If errno ==
    0, it means there was a version error (ie. upgrade libiptc). */
 /* Rule numbers start at 1 for the first rule. */
 
 /* Insert the entry `e' in chain `chain' into position `rulenum'. */
-int iptc_insert_entry(const ipt_chainlabel chain,
-		      const struct ipt_entry *e,
-		      unsigned int rulenum,
-		      iptc_handle_t *handle);
+	int iptc_insert_entry(const ipt_chainlabel chain,
+						  const struct ipt_entry *e,
+						  unsigned int rulenum, iptc_handle_t * handle);
 
 /* Atomically replace rule `rulenum' in `chain' with `e'. */
-int iptc_replace_entry(const ipt_chainlabel chain,
-		       const struct ipt_entry *e,
-		       unsigned int rulenum,
-		       iptc_handle_t *handle);
+	int iptc_replace_entry(const ipt_chainlabel chain,
+						   const struct ipt_entry *e,
+						   unsigned int rulenum, iptc_handle_t * handle);
 
 /* Append entry `e' to chain `chain'.  Equivalent to insert with
    rulenum = length of chain. */
-int iptc_append_entry(const ipt_chainlabel chain,
-		      const struct ipt_entry *e,
-		      iptc_handle_t *handle);
+	int iptc_append_entry(const ipt_chainlabel chain,
+						  const struct ipt_entry *e,
+						  iptc_handle_t * handle);
 
 /* Delete the first rule in `chain' which matches `e', subject to
    matchmask (array of length == origfw) */
-int iptc_delete_entry(const ipt_chainlabel chain,
-		      const struct ipt_entry *origfw,
-		      unsigned char *matchmask,
-		      iptc_handle_t *handle);
+	int iptc_delete_entry(const ipt_chainlabel chain,
+						  const struct ipt_entry *origfw,
+						  unsigned char *matchmask,
+						  iptc_handle_t * handle);
 
 /* Delete the rule in position `rulenum' in `chain'. */
-int iptc_delete_num_entry(const ipt_chainlabel chain,
-			  unsigned int rulenum,
-			  iptc_handle_t *handle);
+	int iptc_delete_num_entry(const ipt_chainlabel chain,
+							  unsigned int rulenum,
+							  iptc_handle_t * handle);
 
 /* Check the packet `e' on chain `chain'.  Returns the verdict, or
    NULL and sets errno. */
-const char *iptc_check_packet(const ipt_chainlabel chain,
-			      struct ipt_entry *entry,
-			      iptc_handle_t *handle);
+	const char *iptc_check_packet(const ipt_chainlabel chain,
+								  struct ipt_entry *entry,
+								  iptc_handle_t * handle);
 
 /* Flushes the entries in the given chain (ie. empties chain). */
-int iptc_flush_entries(const ipt_chainlabel chain,
-		       iptc_handle_t *handle);
+	int iptc_flush_entries(const ipt_chainlabel chain,
+						   iptc_handle_t * handle);
 
 /* Zeroes the counters in a chain. */
-int iptc_zero_entries(const ipt_chainlabel chain,
-		      iptc_handle_t *handle);
+	int iptc_zero_entries(const ipt_chainlabel chain,
+						  iptc_handle_t * handle);
 
 /* Creates a new chain. */
-int iptc_create_chain(const ipt_chainlabel chain,
-		      iptc_handle_t *handle);
+	int iptc_create_chain(const ipt_chainlabel chain,
+						  iptc_handle_t * handle);
 
 /* Deletes a chain. */
-int iptc_delete_chain(const ipt_chainlabel chain,
-		      iptc_handle_t *handle);
+	int iptc_delete_chain(const ipt_chainlabel chain,
+						  iptc_handle_t * handle);
 
 /* Renames a chain. */
-int iptc_rename_chain(const ipt_chainlabel oldname,
-		      const ipt_chainlabel newname,
-		      iptc_handle_t *handle);
+	int iptc_rename_chain(const ipt_chainlabel oldname,
+						  const ipt_chainlabel newname,
+						  iptc_handle_t * handle);
 
 /* Sets the policy on a built-in chain. */
-int iptc_set_policy(const ipt_chainlabel chain,
-		    const ipt_chainlabel policy,
-		    struct ipt_counters *counters,
-		    iptc_handle_t *handle);
+	int iptc_set_policy(const ipt_chainlabel chain,
+						const ipt_chainlabel policy,
+						struct ipt_counters *counters,
+						iptc_handle_t * handle);
 
 /* Get the number of references to this chain */
-int iptc_get_references(unsigned int *ref,
-			const ipt_chainlabel chain,
-			iptc_handle_t *handle);
+	int iptc_get_references(unsigned int *ref,
+							const ipt_chainlabel chain,
+							iptc_handle_t * handle);
 
 /* read packet and byte counters for a specific rule */
-struct ipt_counters *iptc_read_counter(const ipt_chainlabel chain,
-				       unsigned int rulenum,
-				       iptc_handle_t *handle);
+	struct ipt_counters *iptc_read_counter(const ipt_chainlabel chain,
+										   unsigned int rulenum,
+										   iptc_handle_t * handle);
 
 /* zero packet and byte counters for a specific rule */
-int iptc_zero_counter(const ipt_chainlabel chain,
-		      unsigned int rulenum,
-		      iptc_handle_t *handle);
+	int iptc_zero_counter(const ipt_chainlabel chain,
+						  unsigned int rulenum, iptc_handle_t * handle);
 
 /* set packet and byte counters for a specific rule */
-int iptc_set_counter(const ipt_chainlabel chain,
-		     unsigned int rulenum,
-		     struct ipt_counters *counters,
-		     iptc_handle_t *handle);
+	int iptc_set_counter(const ipt_chainlabel chain,
+						 unsigned int rulenum,
+						 struct ipt_counters *counters,
+						 iptc_handle_t * handle);
 
 /* Makes the actual changes. */
-int iptc_commit(iptc_handle_t *handle);
+	int iptc_commit(iptc_handle_t * handle);
 
 /* Get raw socket. */
-int iptc_get_raw_socket();
+	int iptc_get_raw_socket();
 
 /* Translates errno numbers into more human-readable form than strerror. */
-const char *iptc_strerror(int err);
+	const char *iptc_strerror(int err);
 
 #ifdef __cplusplus
 }
 #endif
-
-
-#endif /* _LIBIPTC_H */
+#endif							/* _LIBIPTC_H */

src/libiptc/linux_list.h

@@ -69,9 +69,9 @@ struct list_head {
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __list_add(struct list_head *new,
-			      struct list_head *prev,
-			      struct list_head *next)
+static inline void
+__list_add(struct list_head *new,
+		   struct list_head *prev, struct list_head *next)
 {
 	next->prev = new;
 	new->next = next;
@@ -87,7 +87,8 @@ static inline void __list_add(struct list_head *new,
  * Insert a new entry after the specified head.
  * This is good for implementing stacks.
  */
-static inline void list_add(struct list_head *new, struct list_head *head)
+static inline void
+list_add(struct list_head *new, struct list_head *head)
 {
 	__list_add(new, head, head->next);
 }
@@ -100,7 +101,8 @@ static inline void list_add(struct list_head *new, struct list_head *head)
  * Insert a new entry before the specified head.
  * This is useful for implementing queues.
  */
-static inline void list_add_tail(struct list_head *new, struct list_head *head)
+static inline void
+list_add_tail(struct list_head *new, struct list_head *head)
 {
 	__list_add(new, head->prev, head);
 }
@@ -111,8 +113,9 @@ static inline void list_add_tail(struct list_head *new, struct list_head *head)
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __list_add_rcu(struct list_head * new,
-		struct list_head * prev, struct list_head * next)
+static inline void
+__list_add_rcu(struct list_head *new,
+			   struct list_head *prev, struct list_head *next)
 {
 	new->next = next;
 	new->prev = prev;
@@ -137,7 +140,8 @@ static inline void __list_add_rcu(struct list_head * new,
  * the _rcu list-traversal primitives, such as
  * list_for_each_entry_rcu().
  */
-static inline void list_add_rcu(struct list_head *new, struct list_head *head)
+static inline void
+list_add_rcu(struct list_head *new, struct list_head *head)
 {
 	__list_add_rcu(new, head, head->next);
 }
@@ -158,8 +162,8 @@ static inline void list_add_rcu(struct list_head *new, struct list_head *head)
  * the _rcu list-traversal primitives, such as
  * list_for_each_entry_rcu().
  */
-static inline void list_add_tail_rcu(struct list_head *new,
-					struct list_head *head)
+static inline void
+list_add_tail_rcu(struct list_head *new, struct list_head *head)
 {
 	__list_add_rcu(new, head->prev, head);
 }
@@ -171,7 +175,8 @@ static inline void list_add_tail_rcu(struct list_head *new,
  * This is only for internal list manipulation where we know
  * the prev/next entries already!
  */
-static inline void __list_del(struct list_head * prev, struct list_head * next)
+static inline void
+__list_del(struct list_head *prev, struct list_head *next)
 {
 	next->prev = prev;
 	prev->next = next;
@@ -183,7 +188,8 @@ static inline void __list_del(struct list_head * prev, struct list_head * next)
  * Note: list_empty on entry does not return true after this, the entry is
  * in an undefined state.
  */
-static inline void list_del(struct list_head *entry)
+static inline void
+list_del(struct list_head *entry)
 {
 	__list_del(entry->prev, entry->next);
 	entry->next = LIST_POISON1;
@@ -214,7 +220,8 @@ static inline void list_del(struct list_head *entry)
  * or call_rcu() must be used to defer freeing until an RCU
  * grace period has elapsed.
  */
-static inline void list_del_rcu(struct list_head *entry)
+static inline void
+list_del_rcu(struct list_head *entry)
 {
 	__list_del(entry->prev, entry->next);
 	entry->prev = LIST_POISON2;
@@ -224,7 +231,8 @@ static inline void list_del_rcu(struct list_head *entry)
  * list_del_init - deletes entry from list and reinitialize it.
  * @entry: the element to delete from the list.
  */
-static inline void list_del_init(struct list_head *entry)
+static inline void
+list_del_init(struct list_head *entry)
 {
 	__list_del(entry->prev, entry->next);
 	INIT_LIST_HEAD(entry);
@@ -235,10 +243,11 @@ static inline void list_del_init(struct list_head *entry)
  * @list: the entry to move
  * @head: the head that will precede our entry
  */
-static inline void list_move(struct list_head *list, struct list_head *head)
+static inline void
+list_move(struct list_head *list, struct list_head *head)
 {
-        __list_del(list->prev, list->next);
-        list_add(list, head);
+	__list_del(list->prev, list->next);
+	list_add(list, head);
 }
 
 /**
@@ -246,18 +255,19 @@ static inline void list_move(struct list_head *list, struct list_head *head)
  * @list: the entry to move
  * @head: the head that will follow our entry
  */
-static inline void list_move_tail(struct list_head *list,
-				  struct list_head *head)
+static inline void
+list_move_tail(struct list_head *list, struct list_head *head)
 {
-        __list_del(list->prev, list->next);
-        list_add_tail(list, head);
+	__list_del(list->prev, list->next);
+	list_add_tail(list, head);
 }
 
 /**
  * list_empty - tests whether a list is empty
  * @head: the list to test.
  */
-static inline int list_empty(const struct list_head *head)
+static inline int
+list_empty(const struct list_head *head)
 {
 	return head->next == head;
 }
@@ -274,14 +284,15 @@ static inline int list_empty(const struct list_head *head)
  *
  * @head: the list to test.
  */
-static inline int list_empty_careful(const struct list_head *head)
+static inline int
+list_empty_careful(const struct list_head *head)
 {
 	struct list_head *next = head->next;
 	return (next == head) && (next == head->prev);
 }
 
-static inline void __list_splice(struct list_head *list,
-				 struct list_head *head)
+static inline void
+__list_splice(struct list_head *list, struct list_head *head)
 {
 	struct list_head *first = list->next;
 	struct list_head *last = list->prev;
@@ -299,7 +310,8 @@ static inline void __list_splice(struct list_head *list,
  * @list: the new list to add.
  * @head: the place to add it in the first list.
  */
-static inline void list_splice(struct list_head *list, struct list_head *head)
+static inline void
+list_splice(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list))
 		__list_splice(list, head);
@@ -312,8 +324,8 @@ static inline void list_splice(struct list_head *list, struct list_head *head)
  *
  * The list at @list is reinitialised
  */
-static inline void list_splice_init(struct list_head *list,
-				    struct list_head *head)
+static inline void
+list_splice_init(struct list_head *list, struct list_head *head)
 {
 	if (!list_empty(list)) {
 		__list_splice(list, head);
@@ -519,17 +531,20 @@ struct hlist_node {
 #define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
 #define INIT_HLIST_NODE(ptr) ((ptr)->next = NULL, (ptr)->pprev = NULL)
 
-static inline int hlist_unhashed(const struct hlist_node *h)
+static inline int
+hlist_unhashed(const struct hlist_node *h)
 {
 	return !h->pprev;
 }
 
-static inline int hlist_empty(const struct hlist_head *h)
+static inline int
+hlist_empty(const struct hlist_head *h)
 {
 	return !h->first;
 }
 
-static inline void __hlist_del(struct hlist_node *n)
+static inline void
+__hlist_del(struct hlist_node *n)
 {
 	struct hlist_node *next = n->next;
 	struct hlist_node **pprev = n->pprev;
@@ -538,7 +553,8 @@ static inline void __hlist_del(struct hlist_node *n)
 		next->pprev = pprev;
 }
 
-static inline void hlist_del(struct hlist_node *n)
+static inline void
+hlist_del(struct hlist_node *n)
 {
 	__hlist_del(n);
 	n->next = LIST_POISON1;
@@ -564,15 +580,17 @@ static inline void hlist_del(struct hlist_node *n)
  * the _rcu list-traversal primitives, such as
  * hlist_for_each_entry().
  */
-static inline void hlist_del_rcu(struct hlist_node *n)
+static inline void
+hlist_del_rcu(struct hlist_node *n)
 {
 	__hlist_del(n);
 	n->pprev = LIST_POISON2;
 }
 
-static inline void hlist_del_init(struct hlist_node *n)
+static inline void
+hlist_del_init(struct hlist_node *n)
 {
-	if (n->pprev)  {
+	if (n->pprev) {
 		__hlist_del(n);
 		INIT_HLIST_NODE(n);
 	}
@@ -580,7 +598,8 @@ static inline void hlist_del_init(struct hlist_node *n)
 
 #define hlist_del_rcu_init hlist_del_init
 
-static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
+static inline void
+hlist_add_head(struct hlist_node *n, struct hlist_head *h)
 {
 	struct hlist_node *first = h->first;
 	n->next = first;
@@ -610,8 +629,8 @@ static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h)
  *
  * OK, so why don't we have an hlist_for_each_entry_rcu()???
  */
-static inline void hlist_add_head_rcu(struct hlist_node *n,
-					struct hlist_head *h)
+static inline void
+hlist_add_head_rcu(struct hlist_node *n, struct hlist_head *h)
 {
 	struct hlist_node *first = h->first;
 	n->next = first;
@@ -623,8 +642,8 @@ static inline void hlist_add_head_rcu(struct hlist_node *n,
 }
 
 /* next must be != NULL */
-static inline void hlist_add_before(struct hlist_node *n,
-					struct hlist_node *next)
+static inline void
+hlist_add_before(struct hlist_node *n, struct hlist_node *next)
 {
 	n->pprev = next->pprev;
 	n->next = next;
@@ -632,15 +651,15 @@ static inline void hlist_add_before(struct hlist_node *n,
 	*(n->pprev) = n;
 }
 
-static inline void hlist_add_after(struct hlist_node *n,
-					struct hlist_node *next)
+static inline void
+hlist_add_after(struct hlist_node *n, struct hlist_node *next)
 {
 	next->next = n->next;
 	n->next = next;
 	next->pprev = &n->next;
 
-	if(next->next)
-		next->next->pprev  = &next->next;
+	if (next->next)
+		next->next->pprev = &next->next;
 }
 
 #define hlist_entry(ptr, type, member) container_of(ptr,type,member)

src/libnetlink.c

@@ -31,12 +31,15 @@
 #include "libnetlink.h"
 #include "log.h"
 
-void rtnl_close(struct rtnl_handle *rth)
+void
+rtnl_close(struct rtnl_handle *rth)
 {
 	close(rth->fd);
 }
 
-int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol)
+int
+rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
+				  int protocol)
 {
 	socklen_t addr_len;
 	int sndbuf = 32768;
@@ -50,12 +53,14 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int proto
 		return -1;
 	}
 
-	if (setsockopt(rth->fd,SOL_SOCKET,SO_SNDBUF,&sndbuf,sizeof(sndbuf)) < 0) {
+	if (setsockopt(rth->fd, SOL_SOCKET, SO_SNDBUF, &sndbuf, sizeof(sndbuf))
+		< 0) {
 		perror("SO_SNDBUF");
 		return -1;
 	}
 
-	if (setsockopt(rth->fd,SOL_SOCKET,SO_RCVBUF,&rcvbuf,sizeof(rcvbuf)) < 0) {
+	if (setsockopt(rth->fd, SOL_SOCKET, SO_RCVBUF, &rcvbuf, sizeof(rcvbuf))
+		< 0) {
 		perror("SO_RCVBUF");
 		return -1;
 	}
@@ -64,12 +69,14 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int proto
 	rth->local.nl_family = AF_NETLINK;
 	rth->local.nl_groups = subscriptions;
 
-	if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
+	if (bind(rth->fd, (struct sockaddr *) &rth->local, sizeof(rth->local))
+		< 0) {
 		perror("Cannot bind netlink socket");
 		return -1;
 	}
 	addr_len = sizeof(rth->local);
-	if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
+	if (getsockname(rth->fd, (struct sockaddr *) &rth->local, &addr_len) <
+		0) {
 		perror("Cannot getsockname");
 		return -1;
 	}
@@ -85,12 +92,14 @@ int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int proto
 	return 0;
 }
 
-int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
+int
+rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
 {
 	return rtnl_open_byproto(rth, subscriptions, NETLINK_ROUTE);
 }
 
-int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
+int
+rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 {
 	struct {
 		struct nlmsghdr nlh;
@@ -104,36 +113,40 @@ int rtnl_wilddump_request(struct rtnl_handle *rth, int family, int type)
 	memset(&req, 0, sizeof(req));
 	req.nlh.nlmsg_len = sizeof(req);
 	req.nlh.nlmsg_type = type;
-	req.nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+	req.nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
 	req.nlh.nlmsg_pid = 0;
 	req.nlh.nlmsg_seq = rth->dump = ++rth->seq;
 	req.g.rtgen_family = family;
 
-	return sendto(rth->fd, (void*)&req, sizeof(req), 0,
-			(struct sockaddr*)&nladdr, sizeof(nladdr));
+	return sendto(rth->fd, (void *) &req, sizeof(req), 0,
+				  (struct sockaddr *) &nladdr, sizeof(nladdr));
 }
 
-int rtnl_send(struct rtnl_handle *rth, const char *buf, int len)
+int
+rtnl_send(struct rtnl_handle *rth, const char *buf, int len)
 {
 	struct sockaddr_nl nladdr;
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
 
-	return sendto(rth->fd, buf, len, 0, (struct sockaddr*)&nladdr, sizeof(nladdr));
+	return sendto(rth->fd, buf, len, 0, (struct sockaddr *) &nladdr,
+				  sizeof(nladdr));
 }
 
-int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
+int
+rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
 {
 	struct nlmsghdr nlh;
 	struct sockaddr_nl nladdr;
 	struct iovec iov[2] = {
-		{ .iov_base = &nlh, .iov_len = sizeof(nlh) },
-		{ .iov_base = req, .iov_len = len }
+		{.iov_base = &nlh,.iov_len = sizeof(nlh)}
+		,
+		{.iov_base = req,.iov_len = len}
 	};
 	struct msghdr msg = {
 		.msg_name = &nladdr,
-		.msg_namelen = 	sizeof(nladdr),
+		.msg_namelen = sizeof(nladdr),
 		.msg_iov = iov,
 		.msg_iovlen = 2,
 	};
@@ -143,18 +156,17 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
 
 	nlh.nlmsg_len = NLMSG_LENGTH(len);
 	nlh.nlmsg_type = type;
-	nlh.nlmsg_flags = NLM_F_ROOT|NLM_F_MATCH|NLM_F_REQUEST;
+	nlh.nlmsg_flags = NLM_F_ROOT | NLM_F_MATCH | NLM_F_REQUEST;
 	nlh.nlmsg_pid = 0;
 	nlh.nlmsg_seq = rth->dump = ++rth->seq;
 
 	return sendmsg(rth->fd, &msg, 0);
 }
 
-int rtnl_dump_filter(struct rtnl_handle *rth,
-		     rtnl_filter_t filter,
-		     void *arg1,
-		     rtnl_filter_t junk,
-		     void *arg2)
+int
+rtnl_dump_filter(struct rtnl_handle *rth,
+				 rtnl_filter_t filter,
+				 void *arg1, rtnl_filter_t junk, void *arg2)
 {
 	struct sockaddr_nl nladdr;
 	struct iovec iov;
@@ -180,19 +192,19 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
 			perror("OVERRUN");
 			continue;
 		}
-		
+
 		if (status == 0) {
 			error("EOF on netlink\n");
 			return -1;
 		}
 
-		h = (struct nlmsghdr*)buf;
+		h = (struct nlmsghdr *) buf;
 		while (NLMSG_OK(h, status)) {
 			int err;
 
 			if (nladdr.nl_pid != 0 ||
-			    h->nlmsg_pid != rth->local.nl_pid ||
-			    h->nlmsg_seq != rth->dump) {
+				h->nlmsg_pid != rth->local.nl_pid ||
+				h->nlmsg_seq != rth->dump) {
 				if (junk) {
 					err = junk(&nladdr, h, arg2);
 					if (err < 0)
@@ -204,7 +216,7 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
 			if (h->nlmsg_type == NLMSG_DONE)
 				return 0;
 			if (h->nlmsg_type == NLMSG_ERROR) {
-				struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
+				struct nlmsgerr *err = (struct nlmsgerr *) NLMSG_DATA(h);
 				if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
 					error("ERROR truncated\n");
 				} else {
@@ -217,7 +229,7 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
 			if (err < 0)
 				return err;
 
-skip_it:
+		  skip_it:
 			h = NLMSG_NEXT(h, status);
 		}
 		if (msg.msg_flags & MSG_TRUNC) {
@@ -230,17 +242,17 @@ skip_it:
 	}
 }
 
-int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
-	      unsigned groups, struct nlmsghdr *answer,
-	      rtnl_filter_t junk,
-	      void *jarg)
+int
+rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
+		  unsigned groups, struct nlmsghdr *answer,
+		  rtnl_filter_t junk, void *jarg)
 {
 	int status;
 	unsigned seq;
 	struct nlmsghdr *h;
 	struct sockaddr_nl nladdr;
 	struct iovec iov = {
-		.iov_base = (void*) n,
+		.iov_base = (void *) n,
 		.iov_len = n->nlmsg_len
 	};
 	struct msghdr msg = {
@@ -249,7 +261,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 		.msg_iov = &iov,
 		.msg_iovlen = 1,
 	};
-	char   buf[16384];
+	char buf[16384];
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
@@ -268,7 +280,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 		return -1;
 	}
 
-	memset(buf,0,sizeof(buf));
+	memset(buf, 0, sizeof(buf));
 
 	iov.iov_base = buf;
 
@@ -289,12 +301,12 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 		if (msg.msg_namelen != sizeof(nladdr)) {
 			fatal("sender address length == %d\n", msg.msg_namelen);
 		}
-		for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
+		for (h = (struct nlmsghdr *) buf; status >= sizeof(*h);) {
 			int err;
 			int len = h->nlmsg_len;
 			int l = len - sizeof(*h);
 
-			if (l<0 || len>status) {
+			if (l < 0 || len > status) {
 				if (msg.msg_flags & MSG_TRUNC) {
 					error("Truncated message\n");
 					return -1;
@@ -303,8 +315,8 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 			}
 
 			if (nladdr.nl_pid != peer ||
-			    h->nlmsg_pid != rtnl->local.nl_pid ||
-			    h->nlmsg_seq != seq) {
+				h->nlmsg_pid != rtnl->local.nl_pid ||
+				h->nlmsg_seq != seq) {
 				if (junk) {
 					err = junk(&nladdr, h, jarg);
 					if (err < 0)
@@ -314,7 +326,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 			}
 
 			if (h->nlmsg_type == NLMSG_ERROR) {
-				struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
+				struct nlmsgerr *err = (struct nlmsgerr *) NLMSG_DATA(h);
 				if (l < sizeof(struct nlmsgerr)) {
 					error("ERROR truncated\n");
 				} else {
@@ -324,7 +336,8 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 							memcpy(answer, h, h->nlmsg_len);
 						return 0;
 					}
-					error("RTNETLINK answers (%d): %s", err->error, strerror(errno));
+					error("RTNETLINK answers (%d): %s", err->error,
+						  strerror(errno));
 				}
 				return -1;
 			}
@@ -336,7 +349,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 			error("Unexpected reply!!!\n");
 
 			status -= NLMSG_ALIGN(len);
-			h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
+			h = (struct nlmsghdr *) ((char *) h + NLMSG_ALIGN(len));
 		}
 		if (msg.msg_flags & MSG_TRUNC) {
 			error("Message truncated\n");
@@ -347,9 +360,8 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
 	}
 }
 
-int rtnl_listen(struct rtnl_handle *rtnl,
-		rtnl_filter_t handler,
-		void *jarg)
+int
+rtnl_listen(struct rtnl_handle *rtnl, rtnl_filter_t handler, void *jarg)
 {
 	int status;
 	struct nlmsghdr *h;
@@ -361,7 +373,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
 		.msg_iov = &iov,
 		.msg_iovlen = 1,
 	};
-	char   buf[8192];
+	char buf[8192];
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
@@ -386,12 +398,12 @@ int rtnl_listen(struct rtnl_handle *rtnl,
 		if (msg.msg_namelen != sizeof(nladdr)) {
 			fatal("Sender address length == %d\n", msg.msg_namelen);
 		}
-		for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
+		for (h = (struct nlmsghdr *) buf; status >= sizeof(*h);) {
 			int err;
 			int len = h->nlmsg_len;
 			int l = len - sizeof(*h);
 
-			if (l<0 || len>status) {
+			if (l < 0 || len > status) {
 				if (msg.msg_flags & MSG_TRUNC) {
 					error("Truncated message\n");
 					return -1;
@@ -404,7 +416,7 @@ int rtnl_listen(struct rtnl_handle *rtnl,
 				return err;
 
 			status -= NLMSG_ALIGN(len);
-			h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
+			h = (struct nlmsghdr *) ((char *) h + NLMSG_ALIGN(len));
 		}
 		if (msg.msg_flags & MSG_TRUNC) {
 			error("Message truncated\n");
@@ -416,13 +428,13 @@ int rtnl_listen(struct rtnl_handle *rtnl,
 	}
 }
 
-int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
-		   void *jarg)
+int
+rtnl_from_file(FILE * rtnl, rtnl_filter_t handler, void *jarg)
 {
 	int status;
 	struct sockaddr_nl nladdr;
-	char   buf[8192];
-	struct nlmsghdr *h = (void*)buf;
+	char buf[8192];
+	struct nlmsghdr *h = (void *) buf;
 
 	memset(&nladdr, 0, sizeof(nladdr));
 	nladdr.nl_family = AF_NETLINK;
@@ -445,12 +457,11 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
 			return 0;
 
 		len = h->nlmsg_len;
-		type= h->nlmsg_type;
+		type = h->nlmsg_type;
 		l = len - sizeof(*h);
 
-		if (l<0 || len>sizeof(buf)) {
-			error("!!!malformed message: len=%d @%lu\n",
-				len, ftell(rtnl));
+		if (l < 0 || len > sizeof(buf)) {
+			error("!!!malformed message: len=%d @%lu\n", len, ftell(rtnl));
 			return -1;
 		}
 
@@ -471,12 +482,13 @@ int rtnl_from_file(FILE *rtnl, rtnl_filter_t handler,
 	}
 }
 
-int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
+int
+addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
 {
 	int len = RTA_LENGTH(4);
 	struct rtattr *rta;
 	if (NLMSG_ALIGN(n->nlmsg_len) + len > maxlen) {
-		error("addattr32: Error! max allowed bound %d exceeded\n",maxlen);
+		error("addattr32: Error! max allowed bound %d exceeded\n", maxlen);
 		return -1;
 	}
 	rta = NLMSG_TAIL(n);
@@ -487,14 +499,15 @@ int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data)
 	return 0;
 }
 
-int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
-	      int alen)
+int
+addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
+		  int alen)
 {
 	int len = RTA_LENGTH(alen);
 	struct rtattr *rta;
 
 	if (NLMSG_ALIGN(n->nlmsg_len) + RTA_ALIGN(len) > maxlen) {
-		error("addattr_l ERROR: message exceeded bound of %d\n",maxlen);
+		error("addattr_l ERROR: message exceeded bound of %d\n", maxlen);
 		return -1;
 	}
 	rta = NLMSG_TAIL(n);
@@ -505,10 +518,11 @@ int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data,
 	return 0;
 }
 
-int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
+int
+addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
 {
 	if (NLMSG_ALIGN(n->nlmsg_len) + NLMSG_ALIGN(len) > maxlen) {
-		error("addraw_l ERROR: message exceeded bound of %d\n",maxlen);
+		error("addraw_l ERROR: message exceeded bound of %d\n", maxlen);
 		return -1;
 	}
 
@@ -518,16 +532,18 @@ int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len)
 	return 0;
 }
 
-int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
+int
+rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
 {
 	int len = RTA_LENGTH(4);
 	struct rtattr *subrta;
 
 	if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
-		error("rta_addattr32: Error! max allowed bound %d exceeded\n",maxlen);
+		error("rta_addattr32: Error! max allowed bound %d exceeded\n",
+			  maxlen);
 		return -1;
 	}
-	subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
+	subrta = (struct rtattr *) (((char *) rta) + RTA_ALIGN(rta->rta_len));
 	subrta->rta_type = type;
 	subrta->rta_len = len;
 	memcpy(RTA_DATA(subrta), &data, 4);
@@ -535,17 +551,19 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data)
 	return 0;
 }
 
-int rta_addattr_l(struct rtattr *rta, int maxlen, int type, 
-		  const void *data, int alen)
+int
+rta_addattr_l(struct rtattr *rta, int maxlen, int type,
+			  const void *data, int alen)
 {
 	struct rtattr *subrta;
 	int len = RTA_LENGTH(alen);
 
 	if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
-		error("rta_addattr_l: Error! max allowed bound %d exceeded\n",maxlen);
+		error("rta_addattr_l: Error! max allowed bound %d exceeded\n",
+			  maxlen);
 		return -1;
 	}
-	subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
+	subrta = (struct rtattr *) (((char *) rta) + RTA_ALIGN(rta->rta_len));
 	subrta->rta_type = type;
 	subrta->rta_len = len;
 	memcpy(RTA_DATA(subrta), data, alen);
@@ -553,20 +571,23 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
 	return 0;
 }
 
-int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
+int
+parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
 {
 	memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
 	while (RTA_OK(rta, len)) {
 		if (rta->rta_type <= max)
 			tb[rta->rta_type] = rta;
-		rta = RTA_NEXT(rta,len);
+		rta = RTA_NEXT(rta, len);
 	}
 	if (len)
 		error("!!!Deficit %d, rta_len=%d\n", len, rta->rta_len);
 	return 0;
 }
 
-int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len)
+int
+parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta,
+					 int len)
 {
 	int i = 0;
 
@@ -574,7 +595,7 @@ int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int l
 	while (RTA_OK(rta, len)) {
 		if (rta->rta_type <= max && i < max)
 			tb[i++] = rta;
-		rta = RTA_NEXT(rta,len);
+		rta = RTA_NEXT(rta, len);
 	}
 	if (len)
 		error("!!!Deficit %d, rta_len=%d\n", len, rta->rta_len);

src/libnetlink.h

@@ -1,3 +1,21 @@
+/* This file is part of Netsukuku
+ *
+ * This source code is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This source code is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * Please refer to the GNU Public License for more details.
+ *
+ * You should have received a copy of the GNU Public License along with
+ * this source code; if not, write to:
+ * Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ */
+
 #ifndef __LIBNETLINK_H__
 #define __LIBNETLINK_H__ 1
 
@@ -5,53 +23,57 @@
 #include <linux/netlink.h>
 #include <linux/rtnetlink.h>
 
-struct rtnl_handle
-{
-	int			fd;
-	struct sockaddr_nl	local;
-	struct sockaddr_nl	peer;
-	uint32_t		seq;
-	uint32_t		dump;
+struct rtnl_handle {
+	int fd;
+	struct sockaddr_nl local;
+	struct sockaddr_nl peer;
+	uint32_t seq;
+	uint32_t dump;
 };
 
 extern int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions);
-extern int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int protocol);
+extern int rtnl_open_byproto(struct rtnl_handle *rth,
+							 unsigned subscriptions, int protocol);
 extern void rtnl_close(struct rtnl_handle *rth);
-extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
-extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
+extern int rtnl_wilddump_request(struct rtnl_handle *rth, int fam,
+								 int type);
+extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req,
+							 int len);
 
-typedef int (*rtnl_filter_t)(const struct sockaddr_nl *, 
-			     struct nlmsghdr *n, void *);
+typedef int (*rtnl_filter_t) (const struct sockaddr_nl *,
+							  struct nlmsghdr * n, void *);
 extern int rtnl_dump_filter(struct rtnl_handle *rth, rtnl_filter_t filter,
-			    void *arg1,
-			    rtnl_filter_t junk,
-			    void *arg2);
-extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
-		     unsigned groups, struct nlmsghdr *answer,
-		     rtnl_filter_t junk,
-		     void *jarg);
+							void *arg1, rtnl_filter_t junk, void *arg2);
+extern int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
+					 pid_t peer, unsigned groups, struct nlmsghdr *answer,
+					 rtnl_filter_t junk, void *jarg);
 extern int rtnl_send(struct rtnl_handle *rth, const char *buf, int);
 
 
-extern int addattr32(struct nlmsghdr *n, int maxlen, int type, uint32_t data);
-extern int addattr_l(struct nlmsghdr *n, int maxlen, int type, const void *data, int alen);
-extern int addraw_l(struct nlmsghdr *n, int maxlen, const void *data, int len);
-extern int rta_addattr32(struct rtattr *rta, int maxlen, int type, uint32_t data);
-extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type, const void *data, int alen);
+extern int addattr32(struct nlmsghdr *n, int maxlen, int type,
+					 uint32_t data);
+extern int addattr_l(struct nlmsghdr *n, int maxlen, int type,
+					 const void *data, int alen);
+extern int addraw_l(struct nlmsghdr *n, int maxlen, const void *data,
+					int len);
+extern int rta_addattr32(struct rtattr *rta, int maxlen, int type,
+						 uint32_t data);
+extern int rta_addattr_l(struct rtattr *rta, int maxlen, int type,
+						 const void *data, int alen);
 
-extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len);
-extern int parse_rtattr_byindex(struct rtattr *tb[], int max, struct rtattr *rta, int len);
+extern int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta,
+						int len);
+extern int parse_rtattr_byindex(struct rtattr *tb[], int max,
+								struct rtattr *rta, int len);
 
 #define parse_rtattr_nested(tb, max, rta) \
 	(parse_rtattr((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta)))
 
-extern int rtnl_listen(struct rtnl_handle *, rtnl_filter_t handler, 
-		       void *jarg);
-extern int rtnl_from_file(FILE *, rtnl_filter_t handler,
-		       void *jarg);
+extern int rtnl_listen(struct rtnl_handle *, rtnl_filter_t handler,
+					   void *jarg);
+extern int rtnl_from_file(FILE *, rtnl_filter_t handler, void *jarg);
 
 #define NLMSG_TAIL(nmsg) \
 	((struct rtattr *) (((void *) (nmsg)) + NLMSG_ALIGN((nmsg)->nlmsg_len)))
 
-#endif /* __LIBNETLINK_H__ */
-
+#endif							/* __LIBNETLINK_H__ */

src/libping.c

@@ -34,19 +34,19 @@
 #include "log.h"
 
 #define  MAXPACKET   65535
-#define  PKTSIZE     64 
+#define  PKTSIZE     64
 #define  HDRLEN      ICMP_MINLEN
 #define  DATALEN     (PKTSIZE-HDRLEN)
 #define  MAXDATA     (MAXPKT-HDRLEN-TIMLEN)
 #define  DEF_TIMEOUT 5
 
 struct ping_priv
-ping_priv_default (void)
+ping_priv_default(void)
 {
-  struct ping_priv datum;
-  datum.ident = IDENT_DEFAULT;
-  datum.timo = TIMO_DEFAULT;
-  return datum;
+	struct ping_priv datum;
+	datum.ident = IDENT_DEFAULT;
+	datum.timo = TIMO_DEFAULT;
+	return datum;
 }
 
 /**
@@ -55,323 +55,332 @@ ping_priv_default (void)
  * between now and starttime in milliseconds.
  */
 int
-elapsed_time( struct timeval *starttime ){
-  struct timeval *newtime;
-  int elapsed;
-  newtime = (struct timeval*)xmalloc( sizeof(struct timeval));
-  gettimeofday(newtime,NULL);
-  elapsed = 0;
-  
-  if(( newtime->tv_usec - starttime->tv_usec) > 0 ){
-    elapsed += (newtime->tv_usec - starttime->tv_usec)/1000 ;
-  } 
-  else{
-    elapsed += ( 1000000 + newtime->tv_usec - starttime->tv_usec ) /1000;
-    newtime->tv_sec--;
-  } 
-  if(( newtime->tv_sec - starttime->tv_sec ) > 0 ){
-    elapsed += 1000 * ( newtime->tv_sec - starttime->tv_sec );
-  } 
-  if( elapsed < 1 )
-    elapsed = 1;
-    
-  xfree( newtime );
-  return( elapsed );
+elapsed_time(struct timeval *starttime)
+{
+	struct timeval *newtime;
+	int elapsed;
+	newtime = (struct timeval *) xmalloc(sizeof(struct timeval));
+	gettimeofday(newtime, NULL);
+	elapsed = 0;
+
+	if ((newtime->tv_usec - starttime->tv_usec) > 0) {
+		elapsed += (newtime->tv_usec - starttime->tv_usec) / 1000;
+	} else {
+		elapsed +=
+			(1000000 + newtime->tv_usec - starttime->tv_usec) / 1000;
+		newtime->tv_sec--;
+	}
+	if ((newtime->tv_sec - starttime->tv_sec) > 0) {
+		elapsed += 1000 * (newtime->tv_sec - starttime->tv_sec);
+	}
+	if (elapsed < 1)
+		elapsed = 1;
+
+	xfree(newtime);
+	return (elapsed);
 }
 
 void
-JOEfreeprotoent( struct protoent *p )
+JOEfreeprotoent(struct protoent *p)
 {
-  char **a;
-  xfree( p->p_name );
-  if( p->p_aliases != NULL ){
-    for( a = p->p_aliases; *a != NULL; a++ ){
-      xfree( *a );
-    }
-  }
-  xfree( p );
+	char **a;
+	xfree(p->p_name);
+	if (p->p_aliases != NULL) {
+		for (a = p->p_aliases; *a != NULL; a++) {
+			xfree(*a);
+		}
+	}
+	xfree(p);
 }
 
 void
-JOEfreehostent( struct hostent *h )
+JOEfreehostent(struct hostent *h)
 {
-  char **p;
+	char **p;
 
-  xfree( h->h_name );
-  if( h->h_aliases != NULL ){
-    for( p = h->h_aliases; *p != NULL; ++p )
-      xfree( *p );
-    xfree( h->h_aliases );
-  }
-  if( h->h_addr_list != NULL ){
-    for( p = h->h_addr_list; *p != NULL; ++p )
-      xfree( *p );
-    xfree (h->h_addr_list);
-  }
-  xfree( h );
+	xfree(h->h_name);
+	if (h->h_aliases != NULL) {
+		for (p = h->h_aliases; *p != NULL; ++p)
+			xfree(*p);
+		xfree(h->h_aliases);
+	}
+	if (h->h_addr_list != NULL) {
+		for (p = h->h_addr_list; *p != NULL; ++p)
+			xfree(*p);
+		xfree(h->h_addr_list);
+	}
+	xfree(h);
 }
 
-static int 
-in_checksum( u_short *buf, int len )
+static int
+in_checksum(u_short * buf, int len)
 {
-  register long sum = 0;
-  u_short  answer = 0;
+	register long sum = 0;
+	u_short answer = 0;
 
-  while( len > 1 ){
-    sum += *buf++;
-    len -= 2;
-  }
+	while (len > 1) {
+		sum += *buf++;
+		len -= 2;
+	}
 
-  if( len == 1 ){
-    *( u_char* )( &answer ) = *( u_char* )buf;
-    sum += answer;
-  }
-  sum = ( sum >> 16 ) + ( sum & 0xffff );
-  sum += ( sum >> 16 );     
-  answer = ~sum;     
+	if (len == 1) {
+		*(u_char *) (&answer) = *(u_char *) buf;
+		sum += answer;
+	}
+	sum = (sum >> 16) + (sum & 0xffff);
+	sum += (sum >> 16);
+	answer = ~sum;
 
-  return ( answer );
+	return (answer);
 
-} 
+}
 
 static int
-send_ping( const char *host, struct sockaddr_in *taddr, struct ping_priv * datum )
+send_ping(const char *host, struct sockaddr_in *taddr,
+		  struct ping_priv *datum)
 {
-  int len;
-  int ss;
-  unsigned char buf[ HDRLEN + DATALEN ];
+	int len;
+	int ss;
+	unsigned char buf[HDRLEN + DATALEN];
 
 #define PROTO_BUF_LEN	1024
-  char   proto_buf[PROTO_BUF_LEN];
-  struct protoent *proto = NULL;
-  struct protoent proto_datum;
-
-  struct hostent  *hp = NULL;
-  struct hostent  hent;
-  int herrno;
-  char hbf[9000];
+	char proto_buf[PROTO_BUF_LEN];
+	struct protoent *proto = NULL;
+	struct protoent proto_datum;
+
+	struct hostent *hp = NULL;
+	struct hostent hent;
+	int herrno;
+	char hbf[9000];
 #if defined(_AIX)
-  char *aixbuf;
-  char *probuf;
-  int  rc;
+	char *aixbuf;
+	char *probuf;
+	int rc;
 #endif/*_AIX*/
 
-  struct icmp     *icp;
-  unsigned short  last;
+	struct icmp *icp;
+	unsigned short last;
 
-  len = HDRLEN + DATALEN;
+	len = HDRLEN + DATALEN;
 
 #if defined(__GLIBC__)
-  /* for systems using GNU libc */
-  getprotobyname_r("icmp", &proto_datum, proto_buf, PROTO_BUF_LEN, &proto);
-  if(( gethostbyname_r( host, &hent, hbf, sizeof(hbf), &hp, &herrno ) < 0 )){
-    hp = NULL;
-  }
+	/* for systems using GNU libc */
+	getprotobyname_r("icmp", &proto_datum, proto_buf, PROTO_BUF_LEN,
+					 &proto);
+	if ((gethostbyname_r(host, &hent, hbf, sizeof(hbf), &hp, &herrno) < 0)) {
+		hp = NULL;
+	}
 #elif defined(sun)
-  /* Solaris 5++ */
-  proto = getprotobyname_r("icmp", &proto_datum, proto_buf, PROTO_BUF_LEN);
-  hp    = gethostbyname_r( host, &hent, hbf, sizeof(hbf), &herrno );
+	/* Solaris 5++ */
+	proto =
+		getprotobyname_r("icmp", &proto_datum, proto_buf, PROTO_BUF_LEN);
+	hp = gethostbyname_r(host, &hent, hbf, sizeof(hbf), &herrno);
 #elif defined(_AIX)
-  aixbuf = (char*)xmalloc( 9000 );
-  probuf = (char*)xmalloc( 9000 );
-  rc  = getprotobyname_r( "icmp", &proto,
-                        ( struct protoent_data *)(probuf + sizeof( struct protoent)));
-  rc  = gethostbyname_r ( host, (struct hostent *)aixbuf,
-                        (struct hostent_data *)(aixbuf + sizeof(struct hostent)));
-  hp = (struct hostent*)aixbuf;
+	aixbuf = (char *) xmalloc(9000);
+	probuf = (char *) xmalloc(9000);
+	rc = getprotobyname_r("icmp", &proto,
+						  (struct protoent_data *) (probuf +
+													sizeof(struct
+														   protoent)));
+	rc = gethostbyname_r(host, (struct hostent *) aixbuf,
+						 (struct hostent_data *) (aixbuf +
+												  sizeof(struct hostent)));
+	hp = (struct hostent *) aixbuf;
 #elif ( defined(hpux) || defined(__osf__) )
-  proto  = getprotobyname( "icmp" ); 
-  hp     = gethostbyname( host );
-  herrno = h_errno;
+	proto = getprotobyname("icmp");
+	hp = gethostbyname(host);
+	herrno = h_errno;
 #else
-  /* simply hoping that get*byname is thread-safe */
-  proto  = getprotobyname( "icmp" ); 
-  hp     = gethostbyname( host );
-  herrno = h_errno;
-#endif/*OS SPECIFICS*/
-  
-  if( proto == NULL ) {
-    return -1;
-  }
+	/* simply hoping that get*byname is thread-safe */
+	proto = getprotobyname("icmp");
+	hp = gethostbyname(host);
+	herrno = h_errno;
+#endif							/*OS SPECIFICS */
+
+	if (proto == NULL) {
+		return -1;
+	}
 
-  if(hp != NULL ){
-    memcpy( &taddr->sin_addr, hp->h_addr_list[0], sizeof( taddr->sin_addr ));
-    taddr->sin_port = 0;
-    taddr->sin_family = AF_INET;
-  }
-  else if( inet_aton( host, &taddr->sin_addr ) == 0 ){
-    return -1;
-  }
+	if (hp != NULL) {
+		memcpy(&taddr->sin_addr, hp->h_addr_list[0],
+			   sizeof(taddr->sin_addr));
+		taddr->sin_port = 0;
+		taddr->sin_family = AF_INET;
+	} else if (inet_aton(host, &taddr->sin_addr) == 0) {
+		return -1;
+	}
 
-  last = ntohl( taddr->sin_addr.s_addr ) & 0xFF;
-  if(( last == 0x00 ) || ( last == 0xFF )){
-    return -1;
-  }
+	last = ntohl(taddr->sin_addr.s_addr) & 0xFF;
+	if ((last == 0x00) || (last == 0xFF)) {
+		return -1;
+	}
 
-  if(( datum->sock = socket( AF_INET, SOCK_RAW, proto->p_proto )) < 0 ){
+	if ((datum->sock = socket(AF_INET, SOCK_RAW, proto->p_proto)) < 0) {
 #ifdef  DEBUG
-	  debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
-#endif/*DEBUG*/
-	  return -2;
-  }
+		debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
+#endif	 /*DEBUG*/
+			return -2;
+	}
 
-  icp = (struct icmp *)buf;
-  icp->icmp_type  = ICMP_ECHO;
-  icp->icmp_code  = 0;
-  icp->icmp_cksum = 0;
-  icp->icmp_id    = getpid() & 0xFFFF;
-  icp->icmp_cksum = in_checksum((u_short *)icp, len );
+	icp = (struct icmp *) buf;
+	icp->icmp_type = ICMP_ECHO;
+	icp->icmp_code = 0;
+	icp->icmp_cksum = 0;
+	icp->icmp_id = getpid() & 0xFFFF;
+	icp->icmp_cksum = in_checksum((u_short *) icp, len);
 
-  if(( ss = sendto( datum->sock, buf, sizeof( buf ), 0, 
-				  (struct sockaddr*)taddr, sizeof( *taddr ))) < 0 ){
+	if ((ss = sendto(datum->sock, buf, sizeof(buf), 0,
+					 (struct sockaddr *) taddr, sizeof(*taddr))) < 0) {
 #ifdef  DEBUG
-	  debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
-#endif/*DEBUG*/
-	  return -2;
-  }
-  if( ss != len ){
+		debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
+#endif	 /*DEBUG*/
+			return -2;
+	}
+	if (ss != len) {
 #ifdef  DEBUG
-	  debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
-#endif/*DEBUG*/
-	  return -2;
-  }
-
+		debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
+#endif	 /*DEBUG*/
+			return -2;
+	}
 #if defined(_AIX)
-  xfree( aixbuf );
-  xfree( probuf );
-#endif 
-  /* JOEfreeprotoent( proto ); */
-  /* JOEfreeprotoent( &proto_datum ); */
-  /* JOEfreehostent( hp ); */
-  /* JOEfreehostent( &hent ); */
-  return 0;
+	xfree(aixbuf);
+	xfree(probuf);
+#endif
+	/* JOEfreeprotoent( proto ); */
+	/* JOEfreeprotoent( &proto_datum ); */
+	/* JOEfreehostent( hp ); */
+	/* JOEfreehostent( &hent ); */
+	return 0;
 }
 
-static int 
-recv_ping( struct sockaddr_in *taddr, struct ping_priv * datum )
+static int
+recv_ping(struct sockaddr_in *taddr, struct ping_priv *datum)
 {
 	int len;
 	int from;
 	int nf, cc;
-	unsigned char buf[ HDRLEN + DATALEN ];
-	struct icmp        *icp;
+	unsigned char buf[HDRLEN + DATALEN];
+	struct icmp *icp;
 	struct sockaddr_in faddr;
 	struct timeval to;
 	fd_set readset;
 
 	to.tv_sec = datum->timo / 100000;
-	to.tv_usec = ( datum->timo - ( to.tv_sec * 100000 ) ) * 10;
+	to.tv_usec = (datum->timo - (to.tv_sec * 100000)) * 10;
 
-	FD_ZERO( &readset );
-	FD_SET( datum->sock, &readset );
+	FD_ZERO(&readset);
+	FD_SET(datum->sock, &readset);
 	/* we use select to see if there is any activity
 	   on the socket.  If not, then we've requested an
 	   unreachable network and we'll time out here. */
-	if(( nf = select( datum->sock + 1, &readset, NULL, NULL, &to )) < 0 ){
+	if ((nf = select(datum->sock + 1, &readset, NULL, NULL, &to)) < 0) {
 		datum->rrt = -4;
 #ifdef  DEBUG
 		debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
-#endif/*DEBUG*/    
-		return 0;
+#endif	 /*DEBUG*/
+			return 0;
 	}
-	if( nf == 0 ){ 
-		return -1; 
+	if (nf == 0) {
+		return -1;
 	}
 
 	len = HDRLEN + DATALEN;
-	from = sizeof( faddr ); 
+	from = sizeof(faddr);
 
-	cc = recvfrom( datum->sock, buf, len, 0, (struct sockaddr*)&faddr,(socklen_t*)&from );
-	if( cc < 0 ){
+	cc = recvfrom(datum->sock, buf, len, 0, (struct sockaddr *) &faddr,
+				  (socklen_t *) & from);
+	if (cc < 0) {
 		datum->rrt = -4;
 #ifdef  DEBUG
 		debug(DBG_NORMAL, ERROR_MSG "sock: %s" ERROR_POS, strerror(errno));
-#endif/*DEBUG*/    
-    return 0;
-  }
+#endif	 /*DEBUG*/
+			return 0;
+	}
 
-  icp = (struct icmp *)(buf + HDRLEN + DATALEN );
-  if( faddr.sin_addr.s_addr != taddr->sin_addr.s_addr ){
-    return 1;
-  }
+	icp = (struct icmp *) (buf + HDRLEN + DATALEN);
+	if (faddr.sin_addr.s_addr != taddr->sin_addr.s_addr) {
+		return 1;
+	}
   /*****
   if( icp->icmp_id   != ( getpid() & 0xFFFF )){
     printf( "id: %d\n",  icp->icmp_id );
     return 1; 
   }
   *****/
-  return 0;
+	return 0;
 }
 
-int 
-myping( const char *hostname, int t , struct ping_priv * datum)
+int
+myping(const char *hostname, int t, struct ping_priv *datum)
 {
-  int err;
-  int rrt;
-  struct sockaddr_in sa;
-  struct timeval mytime;
- 
-  datum->ident = getpid() & 0xFFFF;
-
-  if( t == 0 ) datum->timo = 2; 
-  else         datum->timo = t;
-
-  datum->rrt = 0;
-  
-  (void) gettimeofday( &mytime, (struct timezone *)NULL); 
-  if(( err = send_ping( hostname, &sa, datum)) < 0 ){
-    close( datum->sock );
-    return err;
-  }
-  do {
-    rrt = elapsed_time( &mytime );
-    if (datum->rrt < 0)
-      return 0;
-    datum->rrt = rrt;
-    if (datum->rrt > datum->timo * 1000 ) {
-      close( datum->sock );
-      return 0;
-    }
-  } while( recv_ping( &sa, datum ));
-  close( datum->sock ); 
- 
-  return 1;
+	int err;
+	int rrt;
+	struct sockaddr_in sa;
+	struct timeval mytime;
+
+	datum->ident = getpid() & 0xFFFF;
+
+	if (t == 0)
+		datum->timo = 2;
+	else
+		datum->timo = t;
+
+	datum->rrt = 0;
+
+	(void) gettimeofday(&mytime, (struct timezone *) NULL);
+	if ((err = send_ping(hostname, &sa, datum)) < 0) {
+		close(datum->sock);
+		return err;
+	}
+	do {
+		rrt = elapsed_time(&mytime);
+		if (datum->rrt < 0)
+			return 0;
+		datum->rrt = rrt;
+		if (datum->rrt > datum->timo * 1000) {
+			close(datum->sock);
+			return 0;
+		}
+	} while (recv_ping(&sa, datum));
+	close(datum->sock);
+
+	return 1;
 }
 
 int
-pinghost( const char *hostname )
+pinghost(const char *hostname)
 {
-  struct ping_priv datum = ping_priv_default();
-  return myping( hostname, 0, &datum );
+	struct ping_priv datum = ping_priv_default();
+	return myping(hostname, 0, &datum);
 }
 
 int
-pingthost( const char *hostname, int t )
+pingthost(const char *hostname, int t)
 {
-  struct ping_priv datum = ping_priv_default();
-  return myping( hostname, t, &datum );
+	struct ping_priv datum = ping_priv_default();
+	return myping(hostname, t, &datum);
 }
 
 int
-tpinghost( const char *hostname )
+tpinghost(const char *hostname)
 {
-  int ret;
-  struct ping_priv datum = ping_priv_default();
+	int ret;
+	struct ping_priv datum = ping_priv_default();
 
-  ret = myping( hostname, 0, &datum );
-  if(ret > 0 )
-    ret = datum.rrt;
-  return ret;
-} 
+	ret = myping(hostname, 0, &datum);
+	if (ret > 0)
+		ret = datum.rrt;
+	return ret;
+}
 
 int
-tpingthost( const char *hostname, int t )
+tpingthost(const char *hostname, int t)
 {
-  int ret;
-  struct ping_priv datum = ping_priv_default();
+	int ret;
+	struct ping_priv datum = ping_priv_default();
 
-  ret = myping( hostname, t, &datum );
-  if(ret > 0 )
-    ret = datum.rrt;
-  return ret;
+	ret = myping(hostname, t, &datum);
+	if (ret > 0)
+		ret = datum.rrt;
+	return ret;
 }

src/libping.h

@@ -26,65 +26,65 @@
 
 #if defined( __linux__ )
 
-#define ICMP_ECHOREPLY          0 
+#define ICMP_ECHOREPLY          0
 #define ICMP_ECHO               8
 #define ICMP_MINLEN             8
 
 struct ip {
 #if (BYTE_ORDER == LITTLE_ENDIAN || BYTE_ORDER == PDP_ENDIAN)
-        u_char  ip_hl:4,                /* header length */
-                ip_v:4;                 /* version */
+	u_char ip_hl:4,				/* header length */
+	 ip_v:4;					/* version */
 #else
-        u_char  ip_v:4,                 /* version */
-                ip_hl:4;                /* header length */
+	u_char ip_v:4,				/* version */
+	 ip_hl:4;					/* header length */
 #endif
-        u_char  ip_tos;                 /* type of service */
-        short   ip_len;                 /* total length */
-        u_short ip_id;                  /* identification */
-        short   ip_off;                 /* fragment offset field */
-#define IP_DF 0x4000                    /* dont fragment flag */
-#define IP_MF 0x2000                    /* more fragments flag */
-        u_char  ip_ttl;                 /* time to live */
-        u_char  ip_p;                   /* protocol */
-        u_short ip_sum;                 /* checksum */
-        struct  in_addr ip_src,ip_dst;  /* source and dest address */
+	u_char ip_tos;				/* type of service */
+	short ip_len;				/* total length */
+	u_short ip_id;				/* identification */
+	short ip_off;				/* fragment offset field */
+#define IP_DF 0x4000			/* dont fragment flag */
+#define IP_MF 0x2000			/* more fragments flag */
+	u_char ip_ttl;				/* time to live */
+	u_char ip_p;				/* protocol */
+	u_short ip_sum;				/* checksum */
+	struct in_addr ip_src, ip_dst;	/* source and dest address */
 };
 
-#define n_short u_short                 /* normally defined in in_systm.h */
-#define n_long  u_int                   /* redefine for 64-bit machines */
-#define n_time  u_int                   /* redefine for 64-bit machines */
+#define n_short u_short			/* normally defined in in_systm.h */
+#define n_long  u_int			/* redefine for 64-bit machines */
+#define n_time  u_int			/* redefine for 64-bit machines */
 
 struct icmp {
-        u_char  icmp_type;              /* type of message, see below */
-        u_char  icmp_code;              /* type sub code */
-        u_short icmp_cksum;             /* ones complement cksum of struct */
-        union {
-                u_char ih_pptr;                 /* ICMP_PARAMPROB */
-                struct in_addr ih_gwaddr;       /* ICMP_REDIRECT */
-                struct ih_idseq {
-                        n_short icd_id;
-                        n_short icd_seq;
-                } ih_idseq;
-                int ih_void;
-        } icmp_hun;
+	u_char icmp_type;			/* type of message, see below */
+	u_char icmp_code;			/* type sub code */
+	u_short icmp_cksum;			/* ones complement cksum of struct */
+	union {
+		u_char ih_pptr;			/* ICMP_PARAMPROB */
+		struct in_addr ih_gwaddr;	/* ICMP_REDIRECT */
+		struct ih_idseq {
+			n_short icd_id;
+			n_short icd_seq;
+		} ih_idseq;
+		int ih_void;
+	} icmp_hun;
 #define icmp_pptr       icmp_hun.ih_pptr
 #define icmp_gwaddr     icmp_hun.ih_gwaddr
 #define icmp_id         icmp_hun.ih_idseq.icd_id
 #define icmp_seq        icmp_hun.ih_idseq.icd_seq
 #define icmp_void       icmp_hun.ih_void
-        union {
-                struct id_ts {
-                        n_time its_otime;
-                        n_time its_rtime;
-                        n_time its_ttime;
-                } id_ts;
-                struct id_ip  {
-                        struct ip idi_ip;
-                        /* options and then 64 bits of data */
-                } id_ip;
-                n_long  id_mask;
-                char    id_data[1];
-        } icmp_dun;
+	union {
+		struct id_ts {
+			n_time its_otime;
+			n_time its_rtime;
+			n_time its_ttime;
+		} id_ts;
+		struct id_ip {
+			struct ip idi_ip;
+			/* options and then 64 bits of data */
+		} id_ip;
+		n_long id_mask;
+		char id_data[1];
+	} icmp_dun;
 #define icmp_otime      icmp_dun.id_ts.its_otime
 #define icmp_rtime      icmp_dun.id_ts.its_rtime
 #define icmp_ttime      icmp_dun.id_ts.its_ttime
@@ -94,25 +94,25 @@ struct icmp {
 };
 
 #else
-# include <netinet/ip.h>
-# include <netinet/ip_icmp.h>
-#endif /* defined(__linux__) */   
+#include <netinet/ip.h>
+#include <netinet/ip_icmp.h>
+#endif							/* defined(__linux__) */
 
 #define IDENT_DEFAULT 0
 #define TIMO_DEFAULT 2
 
 struct ping_priv {
-  int   ident;
-  int   timo;
-  int   rrt;
-  int   sock;
+	int ident;
+	int timo;
+	int rrt;
+	int sock;
 };
 
-struct ping_priv ping_priv_default (void);
+struct ping_priv ping_priv_default(void);
 
-int pinghost  ( const char *hostname );
-int pingthost ( const char *hostname, int t );
-int tpinghost ( const char *hostname );
-int tpingthost( const char *hostname, int t );
+int pinghost(const char *hostname);
+int pingthost(const char *hostname, int t);
+int tpinghost(const char *hostname);
+int tpingthost(const char *hostname, int t);
 
-#endif/*PING_H*/
+#endif							/*PING_H */

src/ll_map.c

@@ -19,36 +19,37 @@
 #include "xmalloc.h"
 #include "log.h"
 
-struct idxmap
-{
-	struct idxmap * next;
-	int		index;
-	int		type;
-	int		alen;
-	unsigned	flags;
-	unsigned char	addr[8];
-	char		name[16];
+struct idxmap {
+	struct idxmap *next;
+	int index;
+	int type;
+	int alen;
+	unsigned flags;
+	unsigned char addr[8];
+	char name[16];
 };
 
 static struct idxmap *idxmap[16];
 
-void ll_free_index(void)
+void
+ll_free_index(void)
 {
 	struct idxmap *im, **imp;
 	int i;
-	for(i=0; i<16; i++)
-		for (imp=&idxmap[i]; (im=*imp)!=NULL; ) {
+	for (i = 0; i < 16; i++)
+		for (imp = &idxmap[i]; (im = *imp) != NULL;) {
 			imp = &im->next;
 			xfree(im);
 		}
 }
 
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int
+ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 {
 	int h;
 	struct ifinfomsg *ifi = NLMSG_DATA(n);
 	struct idxmap *im, **imp;
-	struct rtattr *tb[IFLA_MAX+1];
+	struct rtattr *tb[IFLA_MAX + 1];
 
 	if (n->nlmsg_type != RTM_NEWLINK)
 		return 0;
@@ -62,9 +63,9 @@ int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	if (tb[IFLA_IFNAME] == NULL)
 		return 0;
 
-	h = ifi->ifi_index&0xF;
+	h = ifi->ifi_index & 0xF;
 
-	for (imp=&idxmap[h]; (im=*imp)!=NULL; imp = &im->next)
+	for (imp = &idxmap[h]; (im = *imp) != NULL; imp = &im->next)
 		if (im->index == ifi->ifi_index)
 			break;
 
@@ -93,13 +94,14 @@ int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
 	return 0;
 }
 
-const char *ll_idx_n2a(int idx, char *buf)
+const char *
+ll_idx_n2a(int idx, char *buf)
 {
 	struct idxmap *im;
 
 	if (idx == 0)
 		return "*";
-	for (im = idxmap[idx&0xF]; im; im = im->next)
+	for (im = idxmap[idx & 0xF]; im; im = im->next)
 		if (im->index == idx)
 			return im->name;
 	snprintf(buf, 16, "if%d", idx);
@@ -107,39 +109,43 @@ const char *ll_idx_n2a(int idx, char *buf)
 }
 
 
-const char *ll_index_to_name(int idx)
+const char *
+ll_index_to_name(int idx)
 {
 	static char nbuf[16];
 
 	return ll_idx_n2a(idx, nbuf);
 }
 
-int ll_index_to_type(int idx)
+int
+ll_index_to_type(int idx)
 {
 	struct idxmap *im;
 
 	if (idx == 0)
 		return -1;
-	for (im = idxmap[idx&0xF]; im; im = im->next)
+	for (im = idxmap[idx & 0xF]; im; im = im->next)
 		if (im->index == idx)
 			return im->type;
 	return -1;
 }
 
-unsigned ll_index_to_flags(int idx)
+unsigned
+ll_index_to_flags(int idx)
 {
 	struct idxmap *im;
 
 	if (idx == 0)
 		return 0;
 
-	for (im = idxmap[idx&0xF]; im; im = im->next)
+	for (im = idxmap[idx & 0xF]; im; im = im->next)
 		if (im->index == idx)
 			return im->flags;
 	return 0;
 }
 
-int ll_name_to_index(const char *name)
+int
+ll_name_to_index(const char *name)
 {
 	static char ncache[16];
 	static int icache;
@@ -150,7 +156,7 @@ int ll_name_to_index(const char *name)
 		return 0;
 	if (icache && strcmp(name, ncache) == 0)
 		return icache;
-	for (i=0; i<16; i++) {
+	for (i = 0; i < 16; i++) {
 		for (im = idxmap[i]; im; im = im->next) {
 			if (strcmp(im->name, name) == 0) {
 				icache = im->index;
@@ -163,39 +169,43 @@ int ll_name_to_index(const char *name)
 }
 
 /* It returns the idx of the `n'th interface it finds up in the map */
-int ll_nth_up_if(int n)
+int
+ll_nth_up_if(int n)
 {
 	unsigned char i, found;
 	unsigned flags;
 
-	if(n <= 0)
+	if (n <= 0)
 		fatal("%s:%d: Bad argument given", ERROR_POS);
-	
-	for(found=0, i=1; i<=16; i++) {
-		flags=ll_index_to_flags(i);
-		if((flags & IFF_UP) && !(flags & IFF_LOOPBACK)) {
+
+	for (found = 0, i = 1; i <= 16; i++) {
+		flags = ll_index_to_flags(i);
+		if ((flags & IFF_UP) && !(flags & IFF_LOOPBACK)) {
 			found++;
-			if(found == n)
+			if (found == n)
 				return i;
 		}
 	}
-	
+
 	return -1;
 }
 
 /* It returns the first the idx of the first interface it finds up in the map */
-int ll_first_up_if(void)
+int
+ll_first_up_if(void)
 {
 	return ll_nth_up_if(1);
 }
-			
-int ll_init_map(struct rtnl_handle *rth)
+
+int
+ll_init_map(struct rtnl_handle *rth)
 {
-	if (rtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK) < 0) 
+	if (rtnl_wilddump_request(rth, AF_UNSPEC, RTM_GETLINK) < 0)
 		fatal("%s:%d: Cannot send dump request", ERROR_POS);
 
-	if (rtnl_dump_filter(rth, (rtnl_filter_t)ll_remember_index, &idxmap, NULL, NULL) < 0) 
-		fatal(ERROR_MSG "Dump terminated",ERROR_POS);
+	if (rtnl_dump_filter
+		(rth, (rtnl_filter_t) ll_remember_index, &idxmap, NULL, NULL) < 0)
+		fatal(ERROR_MSG "Dump terminated", ERROR_POS);
 
 	return 0;
 }

src/ll_map.h

@@ -1,8 +1,23 @@
+/*
+ * ll_map.c
+ *
+ *		This program is free software; you can redistribute it and/or
+ *		modify it under the terms of the GNU General Public License
+ *		as published by the Free Software Foundation; either version
+ *		2 of the License, or (at your option) any later version.
+ *
+ * Authors:	Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
+ *
+ *
+ * Alpt: Added ll_first_up_if
+ */
+
 #ifndef LL_MAP_H
 #define LL_MAP_H
 
 void ll_free_index(void);
-int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
+int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n,
+					  void *arg);
 int ll_init_map(struct rtnl_handle *rth);
 int ll_name_to_index(const char *name);
 const char *ll_index_to_name(int idx);
@@ -12,4 +27,4 @@ unsigned ll_index_to_flags(int idx);
 int ll_first_up_if(void);
 int ll_nth_up_if(int n);
 
-#endif /*LL_MAP_H*/
+#endif							/*LL_MAP_H */

src/llist.c

@@ -43,10 +43,9 @@
 
 #define LLIST_HDR(_struct)	_struct *next, *prev
 
-struct linked_list
-{
-	LLIST_HDR	(struct linked_list);
-}linked_list;
+struct linked_list {
+	LLIST_HDR(struct linked_list);
+} linked_list;
 typedef struct linked_list l_list;
 
 #define is_list_zero(list)						\
@@ -193,7 +192,7 @@ do {									\
 	}								\
 	(typeof((_head)))_nd;						\
 })
- 
+
 /*
  * list_join: 
  * before list_join(list):
@@ -252,7 +251,7 @@ do {									\
 	_lin->next=_n;							\
 	_n->prev=_lin;							\
 } while (0)
-	
+
 /* 
  * list_substitute
  *
@@ -324,7 +323,7 @@ do{									\
 	if(_lmf->next)							\
 		list_swap(_lmf->next, _lmf);				\
 }while(0)
- 
+
 /* 
  * list_moveontop
  *
@@ -510,7 +509,7 @@ do{ 									\
  */
 #define list_copy_all_yes(_nil)	(1)
 #define list_copy_all(list)	list_copy_some((list), list_copy_all_yes)
- 
+
 /*
  * Here below there are the definitions for the linked list with a counter.
  * The arguments format is:
@@ -566,7 +565,7 @@ do{                  							\
 		(*(_counter))--;					\
 	}								\
 } while(0)
-	
+
 
 /* 
  * Zeros the `counter' and set the head pointer to 0.
@@ -632,4 +631,4 @@ do{                  							\
 	_new_head = (typeof((_head)))_hecq;						\
 })									\
 
-#endif /*LLIST_C*/
+#endif							/*LLIST_C */

src/log.c

@@ -33,21 +33,22 @@
 char *__argv0;
 int dbg_lvl;
 int log_to_stderr;
-static int log_facility=LOG_DAEMON;
-int log_file_opened=0;
+static int log_facility = LOG_DAEMON;
+int log_file_opened = 0;
 FILE *log_file, *log_fd;
 
-void log_init(char *prog, int dbg, int log_stderr)
+void
+log_init(char *prog, int dbg, int log_stderr)
 {
-	__argv0=prog;
-	dbg_lvl=dbg;
-	log_to_stderr=log_stderr;
-	if(log_stderr)
-		log_fd=stderr;
-	if(!log_file_opened)
-		log_file=0;
-
-	if(!log_to_stderr)
+	__argv0 = prog;
+	dbg_lvl = dbg;
+	log_to_stderr = log_stderr;
+	if (log_stderr)
+		log_fd = stderr;
+	if (!log_file_opened)
+		log_file = 0;
+
+	if (!log_to_stderr)
 		openlog(__argv0, dbg ? LOG_PID : 0, log_facility);
 }
 
@@ -59,48 +60,51 @@ void log_init(char *prog, int dbg, int log_stderr)
  *
  * On errors it returns -1;
  */
-int log_to_file(char *filename)
+int
+log_to_file(char *filename)
 {
-	if(!filename) {
-		if(log_file)
-			log_fd=log_file;
+	if (!filename) {
+		if (log_file)
+			log_fd = log_file;
 		else
 			return -1;
 		return 0;
 	}
 
-	if(!(log_file=fopen(filename, "w"))) {
-		log_fd=stderr;
+	if (!(log_file = fopen(filename, "w"))) {
+		log_fd = stderr;
 		error("Cannot open the \"%s\" logfile: %s",
-				filename, strerror(errno));
+			  filename, strerror(errno));
 		return -1;
 	}
 
-	log_fd=log_file;
-	log_file_opened=1;
+	log_fd = log_file;
+	log_file_opened = 1;
 
 	return 0;
 }
 
-void close_log_file(void)
+void
+close_log_file(void)
 {
-	if(log_file) {
+	if (log_file) {
 		fflush(log_file);
 		fclose(log_file);
 	}
 }
 
 /* Life is fatal! */
-void fatal(const char *fmt,...)
+void
+fatal(const char *fmt, ...)
 {
-	char str[strlen(fmt)+3];
+	char str[strlen(fmt) + 3];
 	va_list args;
 
-	if(fmt) {
-		str[0]='!';
-		str[1]=' ';
-		strncpy(str+2, fmt, strlen(fmt));
-		str[strlen(fmt)+2]=0;
+	if (fmt) {
+		str[0] = '!';
+		str[1] = ' ';
+		strncpy(str + 2, fmt, strlen(fmt));
+		str[strlen(fmt) + 2] = 0;
 
 		va_start(args, fmt);
 		print_log(LOG_CRIT, str, args);
@@ -108,29 +112,29 @@ void fatal(const char *fmt,...)
 	}
 
 	/** Flush the stream if we want to read something */
-	if(log_to_stderr || log_file)
+	if (log_to_stderr || log_file)
 		fflush(log_fd);
-	if(log_file)
+	if (log_file)
 		close_log_file();
-	/**/
-
+	 /**/
 #ifdef DEBUG
-	/* Useful to catch the error in gdb */
-	kill(getpid(), SIGSEGV);
+		/* Useful to catch the error in gdb */
+		kill(getpid(), SIGSEGV);
 #endif
 	exit(1);
 }
 
 /* Misc errors */
-void error(const char *fmt,...)
+void
+error(const char *fmt, ...)
 {
-	char str[strlen(fmt)+3];
+	char str[strlen(fmt) + 3];
 	va_list args;
 
-	str[0]='*';
-	str[1]=' ';
-	strncpy(str+2, fmt, strlen(fmt));
-	str[strlen(fmt)+2]=0;
+	str[0] = '*';
+	str[1] = ' ';
+	strncpy(str + 2, fmt, strlen(fmt));
+	str[strlen(fmt) + 2] = 0;
 
 	va_start(args, fmt);
 	print_log(LOG_ERR, str, args);
@@ -138,15 +142,16 @@ void error(const char *fmt,...)
 }
 
 /* Let's give some news */
-void loginfo(const char *fmt,...)
+void
+loginfo(const char *fmt, ...)
 {
-	char str[strlen(fmt)+3];
+	char str[strlen(fmt) + 3];
 	va_list args;
 
-	str[0]='+';
-	str[1]=' ';
-	strncpy(str+2, fmt, strlen(fmt));
-	str[strlen(fmt)+2]=0;
+	str[0] = '+';
+	str[1] = ' ';
+	strncpy(str + 2, fmt, strlen(fmt));
+	str[strlen(fmt) + 2] = 0;
 
 	va_start(args, fmt);
 	print_log(LOG_INFO, str, args);
@@ -159,16 +164,17 @@ void loginfo(const char *fmt,...)
  * Damn!
  */
 
-void debug(int lvl, const char *fmt,...)
+void
+debug(int lvl, const char *fmt, ...)
 {
-	char str[strlen(fmt)+3];
+	char str[strlen(fmt) + 3];
 	va_list args;
 
-	if(lvl <= dbg_lvl) {
-		str[0]='#';
-		str[1]=' ';
-		strncpy(str+2, fmt, strlen(fmt));
-		str[strlen(fmt)+2]=0;
+	if (lvl <= dbg_lvl) {
+		str[0] = '#';
+		str[1] = ' ';
+		strncpy(str + 2, fmt, strlen(fmt));
+		str[strlen(fmt) + 2] = 0;
 
 		va_start(args, fmt);
 		print_log(LOG_DEBUG, str, args);
@@ -176,9 +182,10 @@ void debug(int lvl, const char *fmt,...)
 	}
 }
 
-void print_log(int level, const char *fmt, va_list args)
+void
+print_log(int level, const char *fmt, va_list args)
 {
-	if(log_to_stderr || log_file) {
+	if (log_to_stderr || log_file) {
 		vfprintf(log_fd, fmt, args);
 		fprintf(log_fd, "\n");
 	} else

src/log.h

@@ -107,7 +107,7 @@
 #endif
 
 /* functions declaration */
-void log_init(char *, int, int );
+void log_init(char *, int, int);
 int log_to_file(char *filename);
 void close_log_file(void);
 
@@ -118,4 +118,4 @@ void debug(int lvl, const char *, ...);
 
 void print_log(int level, const char *fmt, va_list args);
 
-#endif /*LOG_H*/
+#endif							/*LOG_H */

src/man/Makefile.am

@@ -1,2 +0,0 @@
-man8_MANS = andna.8 ntkd.8 ntk-wifi.8 ntk-resolv.8 netsukuku.conf.5
-man5_MANS = netsukuku.conf.5

src/man/Makefile.in

@@ -1,527 +0,0 @@
-# Makefile.in generated by automake 1.13.3 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994-2013 Free Software Foundation, Inc.
-
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-VPATH = @srcdir@
-am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
-am__make_running_with_option = \
-  case $${target_option-} in \
-      ?) ;; \
-      *) echo "am__make_running_with_option: internal error: invalid" \
-              "target option '$${target_option-}' specified" >&2; \
-         exit 1;; \
-  esac; \
-  has_opt=no; \
-  sane_makeflags=$$MAKEFLAGS; \
-  if $(am__is_gnu_make); then \
-    sane_makeflags=$$MFLAGS; \
-  else \
-    case $$MAKEFLAGS in \
-      *\\[\ \	]*) \
-        bs=\\; \
-        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
-          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
-    esac; \
-  fi; \
-  skip_next=no; \
-  strip_trailopt () \
-  { \
-    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
-  }; \
-  for flg in $$sane_makeflags; do \
-    test $$skip_next = yes && { skip_next=no; continue; }; \
-    case $$flg in \
-      *=*|--*) continue;; \
-        -*I) strip_trailopt 'I'; skip_next=yes;; \
-      -*I?*) strip_trailopt 'I';; \
-        -*O) strip_trailopt 'O'; skip_next=yes;; \
-      -*O?*) strip_trailopt 'O';; \
-        -*l) strip_trailopt 'l'; skip_next=yes;; \
-      -*l?*) strip_trailopt 'l';; \
-      -[dEDm]) skip_next=yes;; \
-      -[JT]) skip_next=yes;; \
-    esac; \
-    case $$flg in \
-      *$$target_option*) has_opt=yes; break;; \
-    esac; \
-  done; \
-  test $$has_opt = yes
-am__make_dryrun = (target_option=n; $(am__make_running_with_option))
-am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
-pkgdatadir = $(datadir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkglibexecdir = $(libexecdir)/@PACKAGE@
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = src/man
-DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/src/config.h
-CONFIG_CLEAN_FILES =
-CONFIG_CLEAN_VPATH_FILES =
-AM_V_P = $(am__v_P_@AM_V@)
-am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
-am__v_P_0 = false
-am__v_P_1 = :
-AM_V_GEN = $(am__v_GEN_@AM_V@)
-am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
-am__v_GEN_0 = @echo "  GEN     " $@;
-am__v_GEN_1 = 
-AM_V_at = $(am__v_at_@AM_V@)
-am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
-am__v_at_0 = @
-am__v_at_1 = 
-SOURCES =
-DIST_SOURCES =
-am__can_run_installinfo = \
-  case $$AM_UPDATE_INFO_DIR in \
-    n|no|NO) false;; \
-    *) (install-info --version) >/dev/null 2>&1;; \
-  esac
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
-  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
-  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
-  for p in $$list; do echo "$$p $$p"; done | \
-  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-    if (++n[$$2] == $(am__install_max)) \
-      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-    END { for (dir in files) print dir, files[dir] }'
-am__base_list = \
-  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__uninstall_files_from_dir = { \
-  test -z "$$files" \
-    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
-    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
-         $(am__cd) "$$dir" && rm -f $$files; }; \
-  }
-man5dir = $(mandir)/man5
-am__installdirs = "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"
-man8dir = $(mandir)/man8
-NROFF = nroff
-MANS = $(man5_MANS) $(man8_MANS)
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMTAR = @AMTAR@
-AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CONF_DIR = @CONF_DIR@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATA_DIR = @DATA_DIR@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-GREP = @GREP@
-IF_METHOD = @IF_METHOD@
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KERNEL_METHOD = @KERNEL_METHOD@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
-OBJEXT = @OBJEXT@
-OTHER_METHOD = @OTHER_METHOD@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_URL = @PACKAGE_URL@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PID_DIR = @PID_DIR@
-RT_METHOD = @RT_METHOD@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-builddir = @builddir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-debug_flags = @debug_flags@
-docdir = @docdir@
-dvidir = @dvidir@
-exec_prefix = @exec_prefix@
-gmp = @gmp@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-htmldir = @htmldir@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localedir = @localedir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-pdfdir = @pdfdir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-psdir = @psdir@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-srcdir = @srcdir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-top_build_prefix = @top_build_prefix@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
-man8_MANS = andna.8 ntkd.8 ntk-wifi.8 ntk-resolv.8 netsukuku.conf.5
-man5_MANS = netsukuku.conf.5
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-	        && { if test -f $@; then exit 0; else break; fi; }; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/man/Makefile'; \
-	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu src/man/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure:  $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(am__aclocal_m4_deps):
-install-man5: $(man5_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(man5_MANS)'; \
-	list2=''; \
-	test -n "$(man5dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.5[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man5:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man5_MANS)'; test -n "$(man5dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
-install-man8: $(man8_MANS)
-	@$(NORMAL_INSTALL)
-	@list1='$(man8_MANS)'; \
-	list2=''; \
-	test -n "$(man8dir)" \
-	  && test -n "`echo $$list1$$list2`" \
-	  || exit 0; \
-	echo " $(MKDIR_P) '$(DESTDIR)$(man8dir)'"; \
-	$(MKDIR_P) "$(DESTDIR)$(man8dir)" || exit 1; \
-	{ for i in $$list1; do echo "$$i"; done;  \
-	if test -n "$$list2"; then \
-	  for i in $$list2; do echo "$$i"; done \
-	    | sed -n '/\.8[a-z]*$$/p'; \
-	fi; \
-	} | while read p; do \
-	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-	  echo "$$d$$p"; echo "$$p"; \
-	done | \
-	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-	sed 'N;N;s,\n, ,g' | { \
-	list=; while read file base inst; do \
-	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man8dir)/$$inst'"; \
-	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man8dir)/$$inst" || exit $$?; \
-	  fi; \
-	done; \
-	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-	while read files; do \
-	  test -z "$$files" || { \
-	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man8dir)'"; \
-	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man8dir)" || exit $$?; }; \
-	done; }
-
-uninstall-man8:
-	@$(NORMAL_UNINSTALL)
-	@list='$(man8_MANS)'; test -n "$(man8dir)" || exit 0; \
-	files=`{ for i in $$list; do echo "$$i"; done; \
-	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^8][0-9a-z]*$$,8,;x' \
-	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	dir='$(DESTDIR)$(man8dir)'; $(am__uninstall_files_from_dir)
-tags TAGS:
-
-ctags CTAGS:
-
-cscope cscopelist:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-	list='$(DISTFILES)'; \
-	  dist_files=`for file in $$list; do echo $$file; done | \
-	  sed -e "s|^$$srcdirstrip/||;t" \
-	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-	case $$dist_files in \
-	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-			   sort -u` ;; \
-	esac; \
-	for file in $$dist_files; do \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d "$(distdir)/$$file"; then \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-	    fi; \
-	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-	  else \
-	    test -f "$(distdir)/$$file" \
-	    || cp -p $$d/$$file "$(distdir)/$$file" \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(MANS)
-installdirs:
-	for dir in "$(DESTDIR)$(man5dir)" "$(DESTDIR)$(man8dir)"; do \
-	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	if test -z '$(STRIP)'; then \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	      install; \
-	else \
-	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
-	fi
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-html-am:
-
-info: info-am
-
-info-am:
-
-install-data-am: install-man
-
-install-dvi: install-dvi-am
-
-install-dvi-am:
-
-install-exec-am:
-
-install-html: install-html-am
-
-install-html-am:
-
-install-info: install-info-am
-
-install-info-am:
-
-install-man: install-man5 install-man8
-
-install-pdf: install-pdf-am
-
-install-pdf-am:
-
-install-ps: install-ps-am
-
-install-ps-am:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-man
-
-uninstall-man: uninstall-man5 uninstall-man8
-
-.MAKE: install-am install-strip
-
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-man5 install-man8 \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-generic pdf pdf-am ps ps-am tags-am uninstall \
-	uninstall-am uninstall-man uninstall-man5 uninstall-man8
-
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:

src/map.h

@@ -19,6 +19,7 @@
 #ifndef MAP_H
 #define MAP_H
 
+#include "includes.h"
 #include "inet.h"
 
 /* Generic map defines */
@@ -29,31 +30,31 @@
 #define MAXLINKS		MAXROUTES
 
 /*** flags ***/
-#define MAP_ME		1		/*The root_node, in other words, me ;)*/
-#define MAP_VOID	(1<<1)		/*It indicates a non existent node*/
+#define MAP_ME		1			/*The root_node, in other words, me ;) */
+#define MAP_VOID	(1<<1)		/*It indicates a non existent node */
 #define MAP_HNODE	(1<<2)		/*Hooking node. The node is currently 
-					  hooking*/
+								   hooking */
 #define MAP_BNODE	(1<<3)		/*The node is a border_node. If this 
-					  flag is set to a root_node, this means 
-					  that we are a bnode at the root_node's 
-					  level*/
-#define MAP_ERNODE	(1<<4)		/*It is an External Rnode*/
-#define MAP_GNODE	(1<<5)		/*It is a gnode*/
-#define MAP_RNODE	(1<<6)		/*If a node has this set, it is one of the rnodes*/
+								   flag is set to a root_node, this means 
+								   that we are a bnode at the root_node's 
+								   level */
+#define MAP_ERNODE	(1<<4)		/*It is an External Rnode */
+#define MAP_GNODE	(1<<5)		/*It is a gnode */
+#define MAP_RNODE	(1<<6)		/*If a node has this set, it is one of the rnodes */
 #define MAP_UPDATE	(1<<7)		/*If it is set, the corresponding route 
-					  in the krnl will be updated*/
+								   in the krnl will be updated */
 #define QSPN_CLOSED	(1<<8)		/*This flag is set only to the rnodes, 
-					  it puts a link in a QSPN_CLOSED state*/
-#define QSPN_OPENED	(1<<9)		/*It puts a link in a QSPN_OPEN state*/
+								   it puts a link in a QSPN_CLOSED state */
+#define QSPN_OPENED	(1<<9)		/*It puts a link in a QSPN_OPEN state */
 #define QSPN_OLD	(1<<10)		/*If a node isn't updated by the current
-					  qspn_round it is marked with QSPN_ROUND.
-					  If in the next qspn_round the same node 
-					  isn't updated it is removed from the map.*/
-#define QSPN_STARTER	(1<<11)		/*The root node is marked with this flag
-					  if it is a qspn_starter*/
+								   qspn_round it is marked with QSPN_ROUND.
+								   If in the next qspn_round the same node 
+								   isn't updated it is removed from the map. */
+#define QSPN_STARTER	(1<<11)	/*The root node is marked with this flag
+								   if it is a qspn_starter */
 #define QSPN_OPENER	(1<<12)		/*If the root_node sent a new qspn_open
-					  it is a qspn_opener*/
-#define MAP_IGW		(1<<13)		/*This node is an Internet gateway*/
+								   it is a qspn_opener */
+#define MAP_IGW		(1<<13)		/*This node is an Internet gateway */
 
 
 /*\ 			    
@@ -71,11 +72,10 @@
 \*/
 
 /* map_rnode is what map_node.r_node points to. (read struct map_node below) */
-typedef struct
-{
-	int	 	*r_node;	/*It's the pointer to the struct of the
-					  r_node in the map*/
-	u_int		trtt;		
+typedef struct {
+	int *r_node;				/*It's the pointer to the struct of the
+								   r_node in the map */
+	u_int trtt;
 	/*
 	 * node <-> root_node total rtt: The rtt to reach the root_node 
 	 * starting from the node which uses this rnode (in millisec). 
@@ -88,17 +88,18 @@ typedef struct
 	 * route_number_to_follow. Gotcha? I hope so.
 	 * Note: The trtt is mainly used to sort the routes
 	 */
-}map_rnode;
+} map_rnode;
 
 /* Note: This int_info is used for the pack of a map_rnode struct (see 
  * get_rnode_block()). 
  * Since the r_node pointer, in the pack, is an integer, we add it in the
  * int_info as a normal 32bit int. */
-INT_INFO map_rnode_iinfo  = { 2, 
-			      { INT_TYPE_32BIT, INT_TYPE_32BIT },
-			      { 0, sizeof(int) },
-			      { 1, 1 }
-			    };
+INT_INFO map_rnode_iinfo = { 2,
+	{INT_TYPE_32BIT, INT_TYPE_32BIT},
+	{0, sizeof(int)},
+	{1, 1}
+};
+
 #define MAP_RNODE_PACK_SZ	(sizeof(int *)+sizeof(u_int))
 
 /*
@@ -122,22 +123,21 @@ INT_INFO map_rnode_iinfo  = { 2,
  * The rnodes of the root_node of 0 level are updated by the radar(), 
  * instead the root_nodes of greater levels are updated by the qspn.
  */
-typedef struct
-{
-	u_short 	flags;
-	u_int		brdcast;	 /*Pkt_id of the last brdcast_pkt sent by this node*/
-	u_short		links;		 /*Number of r_nodes*/
-	map_rnode	*r_node;	 /*These structs will be kept in ascending
-					   order considering their rnode_t.rtt*/
-}map_node;
+typedef struct {
+	u_short flags;
+	u_int brdcast;				/*Pkt_id of the last brdcast_pkt sent by this node */
+	u_short links;				/*Number of r_nodes */
+	map_rnode *r_node;			/*These structs will be kept in ascending
+								   order considering their rnode_t.rtt */
+} map_node;
 
 /* Note: This int_info is used for the pack of a map_rnode struct (see
  * pack_map()) */
-INT_INFO map_node_iinfo = { 3, 
-			    { INT_TYPE_16BIT, INT_TYPE_32BIT, INT_TYPE_16BIT },
-			    { 0, sizeof(short), sizeof(short)+sizeof(int) },
-			    { 1, 1, 1 }
-			  };
+INT_INFO map_node_iinfo = { 3,
+	{INT_TYPE_16BIT, INT_TYPE_32BIT, INT_TYPE_16BIT},
+	{0, sizeof(short), sizeof(short) + sizeof(int)},
+	{1, 1, 1}
+};
 
 #define MAP_NODE_PACK_SZ	(sizeof(u_short)*2 + sizeof(u_int))
 
@@ -146,17 +146,17 @@ INT_INFO map_node_iinfo = { 3,
 #define INTMAP_END(mapstart)	((sizeof(map_node)*MAXGROUPNODE)+(mapstart))
 
 /*This block is used to send/save the int_map and the bnode_map*/
-struct int_map_hdr
-{
+struct int_map_hdr {
 	u_char root_node;
 	size_t int_map_sz;
 	size_t rblock_sz;
-}_PACKED_;
-INT_INFO int_map_hdr_iinfo = { 2, 
-			       { INT_TYPE_32BIT, INT_TYPE_32BIT }, 
-			       { sizeof(char), sizeof(char)+sizeof(size_t) },
-			       { 1, 1 }
-			     };
+} _PACKED_;
+INT_INFO int_map_hdr_iinfo = { 2,
+	{INT_TYPE_32BIT, INT_TYPE_32BIT},
+	{sizeof(char), sizeof(char) + sizeof(size_t)}
+	,
+	{1, 1}
+};
 
 /*
  * The int_map_block is:
@@ -172,49 +172,60 @@ INT_INFO int_map_hdr_iinfo = { 2,
  */
 
 /*conversion functions*/
-int pos_from_node(map_node *node, map_node *map);
-map_node *node_from_pos(int pos, map_node *map);
-void postoip(u_int map_pos, inet_prefix ipstart, inet_prefix *ret);
-void maptoip(u_int mapstart, u_int mapoff, inet_prefix ipstart, inet_prefix *ret);
-int iptomap(u_int mapstart, inet_prefix ip, inet_prefix ipstart, map_node **ret);
+int pos_from_node(map_node * node, map_node * map);
+map_node *node_from_pos(int pos, map_node * map);
+void postoip(u_int map_pos, inet_prefix ipstart, inet_prefix * ret);
+void maptoip(u_int mapstart, u_int mapoff, inet_prefix ipstart,
+			 inet_prefix * ret);
+int iptomap(u_int mapstart, inet_prefix ip, inet_prefix ipstart,
+			map_node ** ret);
 
 map_node *init_map(size_t len);
-void free_map(map_node *map, size_t count);
-void map_node_del(map_node *node);
-void reset_int_map(map_node *map, int maxgroupnode);
-
-map_rnode *rnode_insert(map_rnode *buf, size_t pos, map_rnode *new);
-map_rnode *map_rnode_insert(map_node *node, size_t pos, map_rnode *new);
-map_rnode *rnode_add(map_node *node, map_rnode *new);
-void rnode_swap(map_rnode *one, map_rnode *two);
-void rnode_del(map_node *node, size_t pos);
-void rnode_destroy(map_node *node);
-int rnode_find(map_node *node, void *n);
+void free_map(map_node * map, size_t count);
+void map_node_del(map_node * node);
+void reset_int_map(map_node * map, int maxgroupnode);
+
+map_rnode *rnode_insert(map_rnode * buf, size_t pos, map_rnode * new);
+map_rnode *map_rnode_insert(map_node * node, size_t pos, map_rnode * new);
+map_rnode *rnode_add(map_node * node, map_rnode * new);
+void rnode_swap(map_rnode * one, map_rnode * two);
+void rnode_del(map_node * node, size_t pos);
+void rnode_destroy(map_node * node);
+int rnode_find(map_node * node, void *n);
 
 int rnode_trtt_compar(const void *a, const void *b);
-void rnode_trtt_order(map_node *node);
-void map_routes_order(map_node *map);
-
-u_int get_route_trtt(map_node *node, u_short route);
-void rnode_set_trtt(map_node *node);
-void rnode_recurse_trtt(map_rnode *rnode, int route, struct timeval *trtt);
-void node_recurse_trtt(map_node *node);
-void map_set_trtt(map_node *map);
-map_node *get_gw_node(map_node *node, u_short route);
-
-int merge_maps(map_node *base, map_node *new, map_node *base_root, map_node *new_root);
-int mod_rnode_addr(map_rnode *node, int *map_start, int *new_start);
-int get_rnode_block(int *map, map_node *node, map_rnode *rblock, int rstart);
-map_rnode *map_get_rblock(map_node *map, int *addr_map, int maxgroupnode, int *count);
-int store_rnode_block(int *map, map_node *node, map_rnode *rblock, int rstart);
-int map_store_rblock(map_node *map, int *addr_map, int maxgroupnode, map_rnode *rblock);
-
-int verify_int_map_hdr(struct int_map_hdr *imap_hdr, int maxgroupnode, int maxrnodeblock);
-void pack_map_node(map_node *node, char *pack);
-void unpack_map_node(map_node *node, char *pack);
-char *pack_map(map_node *map, int *addr_map, int maxgroupnode, map_node *root_node, size_t *pack_sz);
-map_node *unpack_map(char *pack, int *addr_map, map_node **new_root, int maxgroupnode, int maxrnodeblock);
-int save_map(map_node *map, map_node *root_node, char *file);
-map_node *load_map(char *file, map_node **new_root);
-
-#endif /*MAP_H*/
+void rnode_trtt_order(map_node * node);
+void map_routes_order(map_node * map);
+
+u_int get_route_trtt(map_node * node, u_short route);
+void rnode_set_trtt(map_node * node);
+void rnode_recurse_trtt(map_rnode * rnode, int route,
+						struct timeval *trtt);
+void node_recurse_trtt(map_node * node);
+void map_set_trtt(map_node * map);
+map_node *get_gw_node(map_node * node, u_short route);
+
+int merge_maps(map_node * base, map_node * new, map_node * base_root,
+			   map_node * new_root);
+int mod_rnode_addr(map_rnode * node, int *map_start, int *new_start);
+int get_rnode_block(int *map, map_node * node, map_rnode * rblock,
+					int rstart);
+map_rnode *map_get_rblock(map_node * map, int *addr_map, int maxgroupnode,
+						  int *count);
+int store_rnode_block(int *map, map_node * node, map_rnode * rblock,
+					  int rstart);
+int map_store_rblock(map_node * map, int *addr_map, int maxgroupnode,
+					 map_rnode * rblock);
+
+int verify_int_map_hdr(struct int_map_hdr *imap_hdr, int maxgroupnode,
+					   int maxrnodeblock);
+void pack_map_node(map_node * node, char *pack);
+void unpack_map_node(map_node * node, char *pack);
+char *pack_map(map_node * map, int *addr_map, int maxgroupnode,
+			   map_node * root_node, size_t * pack_sz);
+map_node *unpack_map(char *pack, int *addr_map, map_node ** new_root,
+					 int maxgroupnode, int maxrnodeblock);
+int save_map(map_node * map, map_node * root_node, char *file);
+map_node *load_map(char *file, map_node ** new_root);
+
+#endif							/*MAP_H */

src/mark.c

@@ -1,4 +1,4 @@
-	         /**************************************
+			 /**************************************
 	        *     AUTHOR: Federico Tomassini        *
 	       *     Copyright (C) Federico Tomassini    *
 	      *     Contact effetom@gmail.com             *
@@ -44,7 +44,7 @@
 
 static int death_loop_rule;
 static int clean_on_exit;
-static rule_store rr,fr,dr;
+static rule_store rr, fr, dr;
 static int dumped;
 
 /* Table init: is too easy for comments.
@@ -52,17 +52,20 @@ static int dumped;
  * 	0
  * 	-1
  */
-int table_init(const char *table, iptc_handle_t *t)
+int
+table_init(const char *table, iptc_handle_t * t)
 {
-	*t=iptc_init(table);
-	error("In table_int, t: %s and errno %d", table,errno);
+	*t = iptc_init(table);
+	error("In table_int, t: %s and errno %d", table, errno);
 	if (!(*t)) {
-		error("In table_init, table %s: -> %s", table,iptc_strerror(errno));
-		err_ret(ERR_NETFIL,-1);
+		error("In table_init, table %s: -> %s", table,
+			  iptc_strerror(errno));
+		err_ret(ERR_NETFIL, -1);
 	}
 	return 0;
 
 }
+
 /*
  * insert the rule -rule- on chain -chain-
  * at the position pos.
@@ -70,48 +73,59 @@ int table_init(const char *table, iptc_handle_t *t)
  * 	0
  * 	-1
  */
-int insert_rule(const char *rule,iptc_handle_t *t,const char *chain,int pos)
+int
+insert_rule(const char *rule, iptc_handle_t * t, const char *chain,
+			int pos)
 {
 	int res;
-	res=iptc_insert_entry(chain,(struct ipt_entry*)rule,0,t);
-	error("res is: %d rule is: %p chain is: %s pos is: %d t is: %p errno is: %d", res, rule, chain, pos, t, errno);
+	res = iptc_insert_entry(chain, (struct ipt_entry *) rule, 0, t);
+	error
+		("res is: %d rule is: %p chain is: %s pos is: %d t is: %p errno is: %d",
+		 res, rule, chain, pos, t, errno);
 	if (!res) {
-		error("In insert_rule: %s.",iptc_strerror(errno));
-		err_ret(ERR_NETRUL,-1);
+		error("In insert_rule: %s.", iptc_strerror(errno));
+		err_ret(ERR_NETRUL, -1);
 	}
 	return 0;
 }
+
 /*
  * append the rule -rule- on chain -chain-.
  * Returns:
  * 	0
  * 	-1
  */
-int append_rule(const char *rule,iptc_handle_t *t,const char *chain)
+int
+append_rule(const char *rule, iptc_handle_t * t, const char *chain)
 {
 	int res;
-	res=iptc_append_entry(chain,(struct ipt_entry*)rule,t);
-	error("res is: %d, chain: %s, rule: %s, t: %s, Errno is: %d",res,chain,rule,t,errno);
+	res = iptc_append_entry(chain, (struct ipt_entry *) rule, t);
+	error("res is: %d, chain: %s, rule: %s, t: %s, Errno is: %d", res,
+		  chain, rule, t, errno);
 	if (!res) {
-		error("In append_rule: %s.",iptc_strerror(errno));
-		err_ret(ERR_NETRUL,-1);
+		error("In append_rule: %s.", iptc_strerror(errno));
+		err_ret(ERR_NETRUL, -1);
 	}
 	return 0;
 }
+
 /*
  * commit modified rules and chains.
  * Returns:
  * 	0
  * 	-1
  */
-int commit_rules(iptc_handle_t *t)
+int
+commit_rules(iptc_handle_t * t)
 {
 	int res;
-	res=iptc_commit(t);
-	error("This is the value of res: %i This is the value of t is: %p errno is: %d", res, t, errno);
+	res = iptc_commit(t);
+	error
+		("This is the value of res: %i This is the value of t is: %p errno is: %d",
+		 res, t, errno);
 	if (!res) {
-		error("In commit_rules: %s.",iptc_strerror(errno));
-		err_ret(ERR_NETCOM,-1);
+		error("In commit_rules: %s.", iptc_strerror(errno));
+		err_ret(ERR_NETCOM, -1);
 	}
 	return 0;
 }
@@ -126,7 +140,8 @@ int commit_rules(iptc_handle_t *t)
  *
  * -rule- has to be RESTORE_OUTPUT_RULE_SZ-sized
  */
-void restore_output_rule_init(char *rule)
+void
+restore_output_rule_init(char *rule)
 {
 	struct ipt_entry *ee;
 	struct ipt_entry_match *em;
@@ -134,35 +149,36 @@ void restore_output_rule_init(char *rule)
 	struct ipt_conntrack_info *ici;
 	struct ipt_connmark_target_info *icmi;
 
-	memset(rule,0,RESTORE_OUTPUT_RULE_SZ);
+	memset(rule, 0, RESTORE_OUTPUT_RULE_SZ);
 
-	ee=(struct ipt_entry*)(rule);
-	em=(struct ipt_entry_match*)(rule+OFFSET_MATCH);
-	ici=(struct ipt_conntrack_info*)(rule+OFFSET_MATCH_INFO);
-	et=(struct ipt_entry_target*)(rule+OFFSET_TARGET);
-	icmi=(struct ipt_connmark_target_info*)(rule+OFFSET_TARGET_INFO);
+	ee = (struct ipt_entry *) (rule);
+	em = (struct ipt_entry_match *) (rule + OFFSET_MATCH);
+	ici = (struct ipt_conntrack_info *) (rule + OFFSET_MATCH_INFO);
+	et = (struct ipt_entry_target *) (rule + OFFSET_TARGET);
+	icmi = (struct ipt_connmark_target_info *) (rule + OFFSET_TARGET_INFO);
 
-	ee->next_offset=RESTORE_OUTPUT_RULE_SZ;
-	ee->target_offset=OFFSET_TARGET;
+	ee->next_offset = RESTORE_OUTPUT_RULE_SZ;
+	ee->target_offset = OFFSET_TARGET;
 
-	snprintf(ee->ip.outiface,IFNAMSIZ,"%s+",NTK_TUNL_PREFIX);
-	memset(ee->ip.outiface_mask,0xFF,strlen(ee->ip.outiface)-1);
+	snprintf(ee->ip.outiface, IFNAMSIZ, "%s+", NTK_TUNL_PREFIX);
+	memset(ee->ip.outiface_mask, 0xFF, strlen(ee->ip.outiface) - 1);
 
-	strcpy(em->u.user.name,MOD_CONNTRACK);
-	em->u.match_size=MATCH_SZ;;
-	em->u.user.match_size=em->u.match_size;
+	strcpy(em->u.user.name, MOD_CONNTRACK);
+	em->u.match_size = MATCH_SZ;;
+	em->u.user.match_size = em->u.match_size;
 
-	et->u.target_size=TARGET_SZ;
-	et->u.user.target_size=et->u.target_size;
-	strcpy(et->u.user.name,MOD_CONNMARK);
+	et->u.target_size = TARGET_SZ;
+	et->u.user.target_size = et->u.target_size;
+	strcpy(et->u.user.name, MOD_CONNMARK);
 
-	ici->flags=1;
-	ici->statemask|=IPT_CONNTRACK_STATE_BIT(IP_CT_RELATED);
-	ici->statemask|=IPT_CONNTRACK_STATE_BIT(IP_CT_ESTABLISHED);
+	ici->flags = 1;
+	ici->statemask |= IPT_CONNTRACK_STATE_BIT(IP_CT_RELATED);
+	ici->statemask |= IPT_CONNTRACK_STATE_BIT(IP_CT_ESTABLISHED);
 
-	icmi->mode=IPT_CONNMARK_RESTORE;
-	icmi->mask= 0xffffffffUL;
+	icmi->mode = IPT_CONNMARK_RESTORE;
+	icmi->mask = 0xffffffffUL;
 }
+
 /*
  * Put in -rule- the netfilter rule:
  *
@@ -171,36 +187,38 @@ void restore_output_rule_init(char *rule)
  *
  * -rule- has to be NTK_FORWARD_RULE_SZ-sized
  */
-void ntk_forward_rule_init(char *rule)
+void
+ntk_forward_rule_init(char *rule)
 {
 	struct ipt_entry *ee;
 	struct ipt_entry_match *em;
 	struct ipt_entry_target *et;
 	struct ipt_conntrack_info *ici;
 
-	memset(rule,0,NTK_FORWARD_RULE_SZ);
+	memset(rule, 0, NTK_FORWARD_RULE_SZ);
 
-	ee=(struct ipt_entry*)(rule);
-	em=(struct ipt_entry_match*)(rule+IPT_ENTRY_SZ);
-	ici=(struct ipt_conntrack_info*)(rule+OFFSET_MATCH_INFO);
-	et=(struct ipt_entry_target*)(rule+OFFSET_TARGET);
+	ee = (struct ipt_entry *) (rule);
+	em = (struct ipt_entry_match *) (rule + IPT_ENTRY_SZ);
+	ici = (struct ipt_conntrack_info *) (rule + OFFSET_MATCH_INFO);
+	et = (struct ipt_entry_target *) (rule + OFFSET_TARGET);
 
-	ee->next_offset=NTK_FORWARD_RULE_SZ;
-	ee->target_offset=OFFSET_TARGET;
-	snprintf(ee->ip.outiface,IFNAMSIZ,"%s+",NTK_TUNL_PREFIX);
-	memset(ee->ip.outiface_mask,0xFF,strlen(ee->ip.outiface)-1);
+	ee->next_offset = NTK_FORWARD_RULE_SZ;
+	ee->target_offset = OFFSET_TARGET;
+	snprintf(ee->ip.outiface, IFNAMSIZ, "%s+", NTK_TUNL_PREFIX);
+	memset(ee->ip.outiface_mask, 0xFF, strlen(ee->ip.outiface) - 1);
 
-	strcpy(em->u.user.name,MOD_CONNTRACK);
-	em->u.match_size=MATCH_SZ;
-	em->u.user.match_size=em->u.match_size;
+	strcpy(em->u.user.name, MOD_CONNTRACK);
+	em->u.match_size = MATCH_SZ;
+	em->u.user.match_size = em->u.match_size;
 
-	ici->flags=1;
-	ici->statemask|=IPT_CONNTRACK_STATE_BIT(IP_CT_NEW);
+	ici->flags = 1;
+	ici->statemask |= IPT_CONNTRACK_STATE_BIT(IP_CT_NEW);
 
-	et->u.target_size=IPT_ENTRY_TARGET_SZ+4;
-	et->u.user.target_size=et->u.target_size;
-	strcpy(et->u.user.name,NTK_MARK_CHAIN);
+	et->u.target_size = IPT_ENTRY_TARGET_SZ + 4;
+	et->u.user.target_size = et->u.target_size;
+	strcpy(et->u.user.name, NTK_MARK_CHAIN);
 }
+
 /*
  * Put in -rule- the netfilter rule:
  *
@@ -210,31 +228,35 @@ void ntk_forward_rule_init(char *rule)
  *
  * -rule- has to be MARK_RULE_SZ-sized
  */
-void mark_rule_init(char *rule,char *outiface,int outiface_num)
+void
+mark_rule_init(char *rule, char *outiface, int outiface_num)
 {
 	struct ipt_entry *ee;
 	struct ipt_entry_target *et;
 	struct ipt_connmark_target_info *icmi;
 
-	memset(rule,0,MARK_RULE_SZ);
+	memset(rule, 0, MARK_RULE_SZ);
 
-	ee=(struct ipt_entry*)(rule);
-	et=(struct ipt_entry_target*)(rule+IPT_ENTRY_SZ);
-	icmi=(struct ipt_connmark_target_info*)(rule+IPT_ENTRY_SZ+IPT_ENTRY_TARGET_SZ);
+	ee = (struct ipt_entry *) (rule);
+	et = (struct ipt_entry_target *) (rule + IPT_ENTRY_SZ);
+	icmi =
+		(struct ipt_connmark_target_info *) (rule + IPT_ENTRY_SZ +
+											 IPT_ENTRY_TARGET_SZ);
 
-	ee->next_offset=MARK_RULE_SZ;
-	ee->target_offset=IPT_ENTRY_SZ;
+	ee->next_offset = MARK_RULE_SZ;
+	ee->target_offset = IPT_ENTRY_SZ;
 
-	et->u.target_size=TARGET_SZ;
-	et->u.user.target_size=et->u.target_size;
-	strcpy(et->u.user.name,MOD_CONNMARK);
+	et->u.target_size = TARGET_SZ;
+	et->u.user.target_size = et->u.target_size;
+	strcpy(et->u.user.name, MOD_CONNMARK);
 
-	icmi->mode=IPT_CONNMARK_SET;
-	icmi->mask= 0xffffffffUL;
-	snprintf(ee->ip.outiface,IFNAMSIZ,"%s%d",outiface,outiface_num);
-	memset(ee->ip.outiface_mask,0xFF,strlen(ee->ip.outiface));
-	icmi->mark=outiface_num+1;
+	icmi->mode = IPT_CONNMARK_SET;
+	icmi->mask = 0xffffffffUL;
+	snprintf(ee->ip.outiface, IFNAMSIZ, "%s%d", outiface, outiface_num);
+	memset(ee->ip.outiface_mask, 0xFF, strlen(ee->ip.outiface));
+	icmi->mark = outiface_num + 1;
 }
+
 /*
  * Put in -rule- the netfilter rule:
  *
@@ -244,51 +266,55 @@ void mark_rule_init(char *rule,char *outiface,int outiface_num)
  *
  * -rule- has to be IGW_FILTER_RULE_SZ-sized
  */
-void igw_mark_rule_init(char *rule)
+void
+igw_mark_rule_init(char *rule)
 {
 	int res;
 	struct ipt_entry *e;
 	struct ipt_entry_target *et;
 
-	memset(rule,0,IGW_FILTER_RULE_SZ);
-	e=(struct ipt_entry*)rule;
-	et=(struct ipt_entry_target*)(rule+IPT_ENTRY_SZ);
+	memset(rule, 0, IGW_FILTER_RULE_SZ);
+	e = (struct ipt_entry *) rule;
+	et = (struct ipt_entry_target *) (rule + IPT_ENTRY_SZ);
 
-	e->next_offset=IGW_FILTER_RULE_SZ;
-	e->target_offset=IPT_ENTRY_SZ;
-	snprintf(e->ip.iniface,IFNAMSIZ,"%s+",NTK_TUNL_PREFIX);
-	memset(e->ip.iniface_mask,0xFF,strlen(e->ip.iniface)-1);
+	e->next_offset = IGW_FILTER_RULE_SZ;
+	e->target_offset = IPT_ENTRY_SZ;
+	snprintf(e->ip.iniface, IFNAMSIZ, "%s+", NTK_TUNL_PREFIX);
+	memset(e->ip.iniface_mask, 0xFF, strlen(e->ip.iniface) - 1);
 
-	et->u.target_size=IPT_ENTRY_TARGET_SZ+4;
-	et->u.user.target_size=et->u.target_size;
-	strcpy(et->u.user.name,MARK_TARGET);
-	res=INET_MARK;
-	memcpy(et->data,&res,4);
+	et->u.target_size = IPT_ENTRY_TARGET_SZ + 4;
+	et->u.user.target_size = et->u.target_size;
+	strcpy(et->u.user.name, MARK_TARGET);
+	res = INET_MARK;
+	memcpy(et->data, &res, 4);
 }
+
 /*
  * Build the chain ntk_mark_chain on
  * mangle table.
  */
-int ntk_mark_chain_init(iptc_handle_t *t)
+int
+ntk_mark_chain_init(iptc_handle_t * t)
 {
 	int res;
-	res=iptc_is_chain(NTK_MARK_CHAIN,*t);
+	res = iptc_is_chain(NTK_MARK_CHAIN, *t);
 	if (res) {
-		debug(DBG_NORMAL,"In mark_init: bizarre, ntk mangle"
-				 "chain is present yet. it will be flushed.");
-		res=iptc_flush_entries(NTK_MARK_CHAIN,t);
+		debug(DBG_NORMAL, "In mark_init: bizarre, ntk mangle"
+			  "chain is present yet. it will be flushed.");
+		res = iptc_flush_entries(NTK_MARK_CHAIN, t);
 		if (!res)
 			goto dontwork;
 	} else {
-		res=iptc_create_chain(NTK_MARK_CHAIN,t);
+		res = iptc_create_chain(NTK_MARK_CHAIN, t);
 		if (!res)
 			goto dontwork;
 	}
 	return 0;
-dontwork:
+  dontwork:
 	error("In ntk_mark_chain_init: -> %s", iptc_strerror(errno));
-	err_ret(ERR_NETCHA,-1)
+	err_ret(ERR_NETCHA, -1)
 }
+
 /*
  * Takes committed rules and copies them
  * to structs. This is usefule to delete
@@ -298,94 +324,98 @@ dontwork:
  * 	0
  * 	-1
  */
-int store_rules()
+int
+store_rules()
 {
 	int res;
 	iptc_handle_t t;
-	struct ipt_entry *r,*f,*d;
+	struct ipt_entry *r, *f, *d;
 
-	res=table_init(MANGLE_TABLE,&t);
+	res = table_init(MANGLE_TABLE, &t);
 	if (res) {
 		error(err_str);
-		err_ret(ERR_NETSTO,-1);
+		err_ret(ERR_NETSTO, -1);
 	}
-	r=(struct ipt_entry*)iptc_first_rule(CHAIN_OUTPUT,&t);
-	f=(struct ipt_entry*)iptc_first_rule(CHAIN_POSTROUTING,&t);
+	r = (struct ipt_entry *) iptc_first_rule(CHAIN_OUTPUT, &t);
+	f = (struct ipt_entry *) iptc_first_rule(CHAIN_POSTROUTING, &t);
 	/* Not elegant style, but faster */
 	if (death_loop_rule) {
-		d=(struct ipt_entry*)iptc_first_rule(CHAIN_PREROUTING,&t);
+		d = (struct ipt_entry *) iptc_first_rule(CHAIN_PREROUTING, &t);
 		if (r && f && d) {
-			rr.sz=RESTORE_OUTPUT_RULE_SZ;
-			memcpy(rr.e,r,rr.sz);
-			rr.chain=CHAIN_OUTPUT;
-			fr.sz=NTK_FORWARD_RULE_SZ;
-			memcpy(fr.e,f,fr.sz);
-			fr.chain=CHAIN_POSTROUTING;
-			dr.sz=IGW_FILTER_RULE_SZ;
-			memcpy(dr.e,d,dr.sz);
-			dr.chain=CHAIN_PREROUTING;
-            error("This is store_rules, And the value of t is: %p", t);
-            commit_rules(&t);
+			rr.sz = RESTORE_OUTPUT_RULE_SZ;
+			memcpy(rr.e, r, rr.sz);
+			rr.chain = CHAIN_OUTPUT;
+			fr.sz = NTK_FORWARD_RULE_SZ;
+			memcpy(fr.e, f, fr.sz);
+			fr.chain = CHAIN_POSTROUTING;
+			dr.sz = IGW_FILTER_RULE_SZ;
+			memcpy(dr.e, d, dr.sz);
+			dr.chain = CHAIN_PREROUTING;
+			error("This is store_rules, And the value of t is: %p", t);
+			commit_rules(&t);
 			return 0;
-		}
-		else {
+		} else {
 
-            error("This is store_rules else, And the value of t is: %p", t);
+			error("This is store_rules else, And the value of t is: %p",
+				  t);
 			commit_rules(&t);
-			error("In store_rules: %s.",iptc_strerror(errno));
-			err_ret(ERR_NETSTO,-1);
+			error("In store_rules: %s.", iptc_strerror(errno));
+			err_ret(ERR_NETSTO, -1);
 		}
 	}
-	if (r && f ) {
-		rr.sz=RESTORE_OUTPUT_RULE_SZ;
-		memcpy(rr.e,r,rr.sz);
-		rr.chain=CHAIN_OUTPUT;
-		fr.sz=NTK_FORWARD_RULE_SZ;
-		memcpy(fr.e,f,fr.sz);
-		fr.chain=CHAIN_POSTROUTING;
+	if (r && f) {
+		rr.sz = RESTORE_OUTPUT_RULE_SZ;
+		memcpy(rr.e, r, rr.sz);
+		rr.chain = CHAIN_OUTPUT;
+		fr.sz = NTK_FORWARD_RULE_SZ;
+		memcpy(fr.e, f, fr.sz);
+		fr.chain = CHAIN_POSTROUTING;
 		commit_rules(&t);
 		return 0;
 	}
 	commit_rules(&t);
-	err_ret(ERR_NETSTO,-1);
+	err_ret(ERR_NETSTO, -1);
 }
 
 /* Two debugging functions: to delete */
-int dump_rules()
+int
+dump_rules()
 {
 	int fd;
 
-	fd=open(DATA_DIR"/mark_rules",O_CREAT | O_WRONLY | O_TRUNC,0540);
-	if (fd==-1) {
-		dumped=0;
+	fd = open(DATA_DIR "/mark_rules", O_CREAT | O_WRONLY | O_TRUNC, 0540);
+	if (fd == -1) {
+		dumped = 0;
 		error("Storing rules to fs: %s.", strerror(errno));
 		return -1;
 	}
-	write(fd,&rr,sizeof(rule_store));
-	write(fd,&fr,sizeof(rule_store));
-	write(fd,&dr,sizeof(rule_store));
+	write(fd, &rr, sizeof(rule_store));
+	write(fd, &fr, sizeof(rule_store));
+	write(fd, &dr, sizeof(rule_store));
 	close(fd);
-	dumped=1;
+	dumped = 1;
 	return 0;
 }
-int load_dump_rules()
+
+int
+load_dump_rules()
 {
 	int fd;
-	rule_store d_rr,d_fr,d_dr;
+	rule_store d_rr, d_fr, d_dr;
 	if (!dumped)
 		return 0;
-	fd=open("/usr/share/netsukuku/mark_rules",O_RDONLY );
-	if (fd==-1)
+	fd = open("/usr/share/netsukuku/mark_rules", O_RDONLY);
+	if (fd == -1)
 		return -1;
-	read(fd,&d_rr,sizeof(rule_store));
-	read(fd,&d_fr,sizeof(rule_store));
-	read(fd,&d_dr,sizeof(rule_store));
+	read(fd, &d_rr, sizeof(rule_store));
+	read(fd, &d_fr, sizeof(rule_store));
+	read(fd, &d_dr, sizeof(rule_store));
 	close(fd);
-	if (memcmp(&rr,&d_rr,sizeof(rule_store)))
+	if (memcmp(&rr, &d_rr, sizeof(rule_store)))
 		error("Stored rule rr differs from original.");
-	if (memcmp(&fr,&d_fr,sizeof(rule_store)))
+	if (memcmp(&fr, &d_fr, sizeof(rule_store)))
 		error("Stored rule fr differs from original.");
-	if (memcmp(&dr,&d_dr,sizeof(rule_store)))
+	if (memcmp(&dr, &d_dr, sizeof(rule_store)))
 		error("Stored rule dr differs from original.");
 	return 0;
 }
@@ -404,107 +434,112 @@ int load_dump_rules()
  *
  * If -1, any rule will be committed.
  */
-int mark_init(int igw)
+int
+mark_init(int igw)
 {
 	int res;
 	iptc_handle_t t;
 	char rule[MAX_RULE_SZ];
 
 	/*res=inet_aton(NTK_NET_STR,&inet_dst);
-	if (!res) {
-		error("Can not convert str to addr.");
-		goto cannot_init;
-	}
-	res=inet_aton(NTK_NET_MASK_STR,&inet_dst_mask);
-	if (!res) {
-		error("Can not convert str to addr.");
-		goto cannot_init;
-	}*/
-
-	res=table_init(MANGLE_TABLE,&t);
+	   if (!res) {
+	   error("Can not convert str to addr.");
+	   goto cannot_init;
+	   }
+	   res=inet_aton(NTK_NET_MASK_STR,&inet_dst_mask);
+	   if (!res) {
+	   error("Can not convert str to addr.");
+	   goto cannot_init;
+	   } */
+
+	res = table_init(MANGLE_TABLE, &t);
 	if (res) {
 		error(err_str);
 		goto cannot_init;
 	}
-	res=ntk_mark_chain_init(&t);
+	res = ntk_mark_chain_init(&t);
 	if (res) {
 		error(err_str);
 		error("Unable to create netfilter ntk_mark_chain.");
 		goto cannot_init;
 	}
 	restore_output_rule_init(rule);
-	res=insert_rule(rule,&t,CHAIN_OUTPUT,0);
+	res = insert_rule(rule, &t, CHAIN_OUTPUT, 0);
 	if (res) {
 		error(err_str);
 		error("Unable to create netfilter restore-marking rule.");
 		goto cannot_init;
 	}
 	ntk_forward_rule_init(rule);
-	res=insert_rule(rule,&t,CHAIN_POSTROUTING,0);
+	res = insert_rule(rule, &t, CHAIN_POSTROUTING, 0);
 	if (res) {
 		error(err_str);
 		error("Unable to create netfilter forwarding rule.");
 		goto cannot_init;
 	}
 	if (igw) {
-		death_loop_rule=1;
+		death_loop_rule = 1;
 		igw_mark_rule_init(rule);
-		res=insert_rule(rule,&t,CHAIN_PREROUTING,0);
+		res = insert_rule(rule, &t, CHAIN_PREROUTING, 0);
 		if (res) {
 			error(err_str);
 			error("Unable to create netfilter igw death loop rule.");
-			death_loop_rule=0;
+			death_loop_rule = 0;
 			goto cannot_init;
 		}
-	}
-	else
-		death_loop_rule=0;
+	} else
+		death_loop_rule = 0;
 
-	res=commit_rules(&t);
+	res = commit_rules(&t);
 	if (res) {
 		error(err_str);
 		error("Netfilter mangle table was not altered!");
 		goto cannot_init;
 	}
-	res=store_rules();
+	res = store_rules();
 	if (res) {
 		error(err_str);
-		error("Rules storing failed: autocleaning netfilter on exit disable.");
-		clean_on_exit=0;
-	}
-	else
-		clean_on_exit=1;
+		error
+			("Rules storing failed: autocleaning netfilter on exit disable.");
+		clean_on_exit = 0;
+	} else
+		clean_on_exit = 1;
 	dump_rules();
-	debug(DBG_NORMAL,"Netfilter chain ntk_mark_chain created (mangle).");
-	debug(DBG_NORMAL,"Netfilter restoring rule created (mangle->output).");
-	debug(DBG_NORMAL,"Netfilter forwarding rule created (mangle->postrouting).");
+	debug(DBG_NORMAL, "Netfilter chain ntk_mark_chain created (mangle).");
+	debug(DBG_NORMAL,
+		  "Netfilter restoring rule created (mangle->output).");
+	debug(DBG_NORMAL,
+		  "Netfilter forwarding rule created (mangle->postrouting).");
 	if (igw)
-		debug(DBG_NORMAL,"Netfilter death loop igw rule created.");
-	debug(DBG_NORMAL,"mark_init(), netfilter mangle table initialized.");
+		debug(DBG_NORMAL, "Netfilter death loop igw rule created.");
+	debug(DBG_NORMAL, "mark_init(), netfilter mangle table initialized.");
 	loginfo("Netfilter mangle table modified.");
 	return 0;
-cannot_init:
-	err_ret(ERR_MRKINI,-1);
+  cannot_init:
+	err_ret(ERR_MRKINI, -1);
 
 }
+
 /*
  * Count the number of rules in ntk_mangle_chain.
  *
  * Returns the number of rules present in
  * this chain.
  */
-int count_ntk_mark_chain(iptc_handle_t *t)
+int
+count_ntk_mark_chain(iptc_handle_t * t)
 {
-	int nchain=0;
+	int nchain = 0;
 	const struct ipt_entry *e;
 
-	e=iptc_first_rule(NTK_MARK_CHAIN,t);
+	e = iptc_first_rule(NTK_MARK_CHAIN, t);
 	while (e) {
 		nchain++;
-		e=iptc_next_rule(e,t);
+		e = iptc_next_rule(e, t);
 	}
 	return nchain;
 }
+
 /*
  * This function build the rules:
  *
@@ -523,43 +558,45 @@ int count_ntk_mark_chain(iptc_handle_t *t)
  * 	0
  * 	-1
  */
-int create_mark_rules(int n)
+int
+create_mark_rules(int n)
 {
 	int nchain;
-	int res,i;
+	int res, i;
 	char rule[MARK_RULE_SZ];
 	iptc_handle_t t;
 
-	res=table_init(MANGLE_TABLE,&t);
+	res = table_init(MANGLE_TABLE, &t);
 	if (res) {
 		error(err_str);
-		err_ret(ERR_NETRUL,-1);
+		err_ret(ERR_NETRUL, -1);
 	}
-	nchain=count_ntk_mark_chain(&t);
-	if (nchain==-1) {
+	nchain = count_ntk_mark_chain(&t);
+	if (nchain == -1) {
 		error("In create_mark_rules: can not read ntk_mark_chain.");
-		err_ret(ERR_NETRUL,-1);
+		err_ret(ERR_NETRUL, -1);
 	}
-	if (nchain>=n) {
-		debug(DBG_NORMAL,"In create_mark_rules: rules present yet.");
+	if (nchain >= n) {
+		debug(DBG_NORMAL, "In create_mark_rules: rules present yet.");
 		return 0;
 	}
-	for (i=nchain;i<n;i++) {
-		mark_rule_init(rule,NTK_TUNL_PREFIX,i);
-		res=append_rule(rule,&t,NTK_MARK_CHAIN);
+	for (i = nchain; i < n; i++) {
+		mark_rule_init(rule, NTK_TUNL_PREFIX, i);
+		res = append_rule(rule, &t, NTK_MARK_CHAIN);
 		if (res) {
 			error(err_str);
-			err_ret(ERR_NETRUL,-1);
+			err_ret(ERR_NETRUL, -1);
 		}
 	}
-	res=commit_rules(&t);
+	res = commit_rules(&t);
 	if (res) {
 		error(err_str);
-		err_ret(ERR_NETRUL,-1);
+		err_ret(ERR_NETRUL, -1);
 	}
-	debug(DBG_NORMAL,"Created %d marking rules.", n-nchain);
+	debug(DBG_NORMAL, "Created %d marking rules.", n - nchain);
 	return 0;
 }
+
 /*
  * Deltion function:
  * this delete the chain ntk_mark_chain
@@ -568,44 +605,48 @@ int create_mark_rules(int n)
  * 	-1
  */
 
-int delete_ntk_forward_chain(iptc_handle_t *t)
+int
+delete_ntk_forward_chain(iptc_handle_t * t)
 {
 	int res;
 
-	res=iptc_is_chain(NTK_MARK_CHAIN,*t);
+	res = iptc_is_chain(NTK_MARK_CHAIN, *t);
 	if (!res)
 		return 0;
-	res=iptc_flush_entries(NTK_MARK_CHAIN,t);
-        if (!res)
+	res = iptc_flush_entries(NTK_MARK_CHAIN, t);
+	if (!res)
 		goto cannot_delete;
-	res=iptc_delete_chain(NTK_MARK_CHAIN,t);
+	res = iptc_delete_chain(NTK_MARK_CHAIN, t);
 	if (!res)
 		goto cannot_delete;
 	return 0;
 
-cannot_delete:
+  cannot_delete:
 	error("In delete_ntk_forward_chain: -> %s", iptc_strerror(errno));
-	err_ret(ERR_NETDEL,-1);
+	err_ret(ERR_NETDEL, -1);
 }
+
 /* delete the first rule of a chain.
  * Unused.
  */
-int delete_first_rule(iptc_handle_t *t,const char *chain)
+int
+delete_first_rule(iptc_handle_t * t, const char *chain)
 {
 	int res;
 	const struct ipt_entry *e;
 
-	e=iptc_first_rule(chain,t);
+	e = iptc_first_rule(chain, t);
 	if (!e)
 		return 0;
-	res=iptc_delete_num_entry(chain,0,t);
+	res = iptc_delete_num_entry(chain, 0, t);
 	if (!res)
 		goto cannot_delete;
 	return 0;
-cannot_delete:
+  cannot_delete:
 	error("In delete_first_rule: -> %s", iptc_strerror(errno));
-	err_ret(ERR_NETDEL,-1);
+	err_ret(ERR_NETDEL, -1);
 }
+
 /*
  * Search for the position of rule -rule.rule-
  * on the chain rule.chain
@@ -613,23 +654,25 @@ cannot_delete:
  * 	pos if rule was found
  * 	-1  if rule wasn't found
  */
-int rule_position(rule_store *rule,iptc_handle_t *t)
+int
+rule_position(rule_store * rule, iptc_handle_t * t)
 {
 	const struct ipt_entry *e;
-	int res,count=-1,found=0;
+	int res, count = -1, found = 0;
 
-	e=iptc_first_rule(rule->chain,t);
+	e = iptc_first_rule(rule->chain, t);
 	while (e) {
 		count++;
-		res=memcmp(e,rule->e,rule->sz);
+		res = memcmp(e, rule->e, rule->sz);
 		if (!res) {
-			found=1;
+			found = 1;
 			break;
 		}
-		e=iptc_next_rule(e,t);
+		e = iptc_next_rule(e, t);
 	}
-	return found?count:-1;
+	return found ? count : -1;
 }
+
 /*
  * Delete rule -rule.rule- on chain rule.chain.
  * Returns
@@ -637,21 +680,24 @@ int rule_position(rule_store *rule,iptc_handle_t *t)
  * 		has to be deleted
  * 	-1 error
  */
-int delete_rule(rule_store *rule,iptc_handle_t *t)
+int
+delete_rule(rule_store * rule, iptc_handle_t * t)
 {
-	int pos,res;
-	pos=rule_position(rule,t);
-	if (pos==-1) {
-		debug(DBG_NORMAL,"No rule in %s to be deleted.",rule->chain);
+	int pos, res;
+	pos = rule_position(rule, t);
+	if (pos == -1) {
+		debug(DBG_NORMAL, "No rule in %s to be deleted.", rule->chain);
 		return 0;
 	}
-	res=iptc_delete_num_entry(rule->chain,pos,t);
+	res = iptc_delete_num_entry(rule->chain, pos, t);
 	if (!res) {
-		debug(DBG_NORMAL,"Unable to delete rule in chain %s.",rule->chain);
-		err_ret(ERR_NETDEL,-1);
+		debug(DBG_NORMAL, "Unable to delete rule in chain %s.",
+			  rule->chain);
+		err_ret(ERR_NETDEL, -1);
 	}
 	return 0;
 }
+
 /*
  * clean the rules committed by:
  * 	- mark_init
@@ -661,40 +707,42 @@ int delete_rule(rule_store *rule,iptc_handle_t *t)
  * 	-1
  */
 
-int mark_close()
+int
+mark_close()
 {
 	iptc_handle_t t;
 	int res;
 
 	if (!clean_on_exit) {
-		debug(DBG_NORMAL,"mark_close: cleaning is not my task.");
+		debug(DBG_NORMAL, "mark_close: cleaning is not my task.");
 		return 0;
 	}
 	load_dump_rules();
-	res=table_init(MANGLE_TABLE,&t);
+	res = table_init(MANGLE_TABLE, &t);
 	if (res)
 		goto reset_error;
-	res=0;
-	res+=delete_rule(&rr,&t);
-	res+=delete_rule(&fr,&t);
+	res = 0;
+	res += delete_rule(&rr, &t);
+	res += delete_rule(&fr, &t);
 	if (death_loop_rule) {
-		debug(DBG_INSANE,"In mark_close: I'm an IGW: deleting death loop rule.");
-		res+=delete_rule(&dr,&t);
+		debug(DBG_INSANE,
+			  "In mark_close: I'm an IGW: deleting death loop rule.");
+		res += delete_rule(&dr, &t);
 	}
 	if (res)
 		goto reset_error;
-	res=delete_ntk_forward_chain(&t);
+	res = delete_ntk_forward_chain(&t);
 	if (res)
 		goto reset_error;
-	res=commit_rules(&t);
+	res = commit_rules(&t);
 	if (res)
 		goto reset_error;
-	debug(DBG_NORMAL,"Netfilter completely restored.");
+	debug(DBG_NORMAL, "Netfilter completely restored.");
 	return 0;
-reset_error:
+  reset_error:
 	error(err_str);
 	loginfo("Netfilter was not restored. To clean, run:\n"
-		"\tiptables -t mangle -F\n"
-		"\tiptables -t mangle -X %s",NTK_MARK_CHAIN);
-	err_ret(ERR_NETRST,-1);
+			"\tiptables -t mangle -F\n"
+			"\tiptables -t mangle -X %s", NTK_MARK_CHAIN);
+	err_ret(ERR_NETRST, -1);
 }