cvs commit: src/etc Makefile libalias.conf src/lib/libalias Makefile src/lib/libalias/libalias Makefile src/lib/libalias/modules Makefile Makefile.inc src/lib/libalias/modules/cuseeme Makefile src/lib/libalias/modules/dummy ...

Tue Sep 26 16:26:54 PDT 2006

piso        2006-09-26 23:26:53 UTC

  FreeBSD src repository

  Modified files:
    etc                  Makefile 
    lib/libalias         Makefile 
    sbin/natd            natd.c 
    sys/conf             files 
    sys/modules/libalias Makefile 
    sys/netinet/libalias alias.c alias.h alias_cuseeme.c 
                         alias_db.c alias_ftp.c alias_irc.c 
                         alias_local.h alias_nbt.c alias_old.c 
                         alias_pptp.c alias_proxy.c alias_skinny.c 
                         alias_smedia.c alias_util.c libalias.3 
  Added files:
    etc                  libalias.conf 
    lib/libalias/libalias Makefile 
    lib/libalias/modules Makefile Makefile.inc 
    lib/libalias/modules/cuseeme Makefile 
    lib/libalias/modules/dummy Makefile 
    lib/libalias/modules/ftp Makefile 
    lib/libalias/modules/irc Makefile 
    lib/libalias/modules/nbt Makefile 
    lib/libalias/modules/pptp Makefile 
    lib/libalias/modules/skinny Makefile 
    lib/libalias/modules/smedia Makefile 
    sys/modules/libalias/libalias Makefile 
    sys/modules/libalias/modules Makefile Makefile.inc modules.inc 
    sys/modules/libalias/modules/cuseeme Makefile 
    sys/modules/libalias/modules/dummy Makefile 
    sys/modules/libalias/modules/ftp Makefile 
    sys/modules/libalias/modules/irc Makefile 
    sys/modules/libalias/modules/nbt Makefile 
    sys/modules/libalias/modules/pptp Makefile 
    sys/modules/libalias/modules/skinny Makefile 
    sys/modules/libalias/modules/smedia Makefile 
    sys/netinet/libalias alias_dummy.c alias_mod.c alias_mod.h 
  Log:
  Summer of Code 2005: improve libalias - part 1 of 2

  With the first part of my previous Summer of Code work, we get:

  -made libalias modular:

   -support for 'particular' protocols (like ftp/irc/etcetc) is no more
    hardcoded inside libalias, but it's available through external
    modules loadable at runtime

   -modules are available both in kernel (/boot/kernel/alias_*.ko) and
    user land (/lib/libalias_*)

   -protocols/applications modularized are: cuseeme, ftp, irc, nbt, pptp,
    skinny and smedia

  -added logging support for kernel side

  -cleanup

  After a buildworld, do a 'mergemaster -i' to install the file libalias.conf
  in /etc or manually copy it.

  During startup (and after every HUP signal) user land applications running
  the new libalias will try to read a file in /etc called libalias.conf:
  that file contains the list of modules to load.

  User land applications affected by this commit are ppp and natd:
  if libalias.conf is present in /etc you won't notice any difference.

  The only kernel land bit affected by this commit is ng_nat:
  if you are using ng_nat, and it doesn't correctly handle
  ftp/irc/etcetc sessions anymore, remember to kldload
  the correspondent module (i.e. kldload alias_ftp).

  General information and details about the inner working are available
  in the libalias man page under the section 'MODULAR ARCHITECTURE
  (AND ipfw(4) SUPPORT)'.

  NOTA BENE: this commit affects _ONLY_ libalias, ipfw in-kernel nat
  support will be part of the next libalias-related commit.

  Approved by: glebius
  Reviewed by: glebius, ru

  Revision  Changes    Path
  1.358     +1 -1      src/etc/Makefile
  1.1       +8 -0      src/etc/libalias.conf (new)
  1.32      +26 -13    src/lib/libalias/Makefile
  1.1       +13 -0     src/lib/libalias/libalias/Makefile (new)
  1.1       +7 -0      src/lib/libalias/modules/Makefile (new)
  1.1       +7 -0      src/lib/libalias/modules/Makefile.inc (new)
  1.1       +6 -0      src/lib/libalias/modules/cuseeme/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/dummy/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/ftp/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/irc/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/nbt/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/pptp/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/skinny/Makefile (new)
  1.1       +6 -0      src/lib/libalias/modules/smedia/Makefile (new)
  1.50      +2 -1      src/sbin/natd/natd.c
  1.1144    +2 -7      src/sys/conf/files
  1.3       +2 -30     src/sys/modules/libalias/Makefile
  1.1       +8 -0      src/sys/modules/libalias/libalias/Makefile (new)
  1.1       +7 -0      src/sys/modules/libalias/modules/Makefile (new)
  1.1       +3 -0      src/sys/modules/libalias/modules/Makefile.inc (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/cuseeme/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/dummy/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/ftp/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/irc/Makefile (new)
  1.1       +11 -0     src/sys/modules/libalias/modules/modules.inc (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/nbt/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/pptp/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/skinny/Makefile (new)
  1.1       +6 -0      src/sys/modules/libalias/modules/smedia/Makefile (new)
  1.54      +211 -80   src/sys/netinet/libalias/alias.c
  1.33      +10 -4     src/sys/netinet/libalias/alias.h
  1.13      +97 -2     src/sys/netinet/libalias/alias_cuseeme.c
  1.69      +83 -66    src/sys/netinet/libalias/alias_db.c
  1.1       +153 -0    src/sys/netinet/libalias/alias_dummy.c (new)
  1.28      +78 -4     src/sys/netinet/libalias/alias_ftp.c
  1.22      +79 -4     src/sys/netinet/libalias/alias_irc.c
  1.33      +12 -52    src/sys/netinet/libalias/alias_local.h
  1.1       +284 -0    src/sys/netinet/libalias/alias_mod.c (new)
  1.1       +157 -0    src/sys/netinet/libalias/alias_mod.h (new)
  1.20      +129 -9    src/sys/netinet/libalias/alias_nbt.c
  1.8       +1 -0      src/sys/netinet/libalias/alias_old.c
  1.15      +167 -26   src/sys/netinet/libalias/alias_pptp.c
  1.27      +3 -9      src/sys/netinet/libalias/alias_proxy.c
  1.13      +73 -7     src/sys/netinet/libalias/alias_skinny.c
  1.16      +85 -3     src/sys/netinet/libalias/alias_smedia.c
  1.19      +1 -0      src/sys/netinet/libalias/alias_util.c
  1.56      +429 -0    src/sys/netinet/libalias/libalias.3