Implement v6 negotiation on the server side.

* gacopyz/stagenames.c: New file.
* gacopyz/Makefile.am (libgacopyz_a_SOURCES): Add stagenames.c.

* gacopyz/gacopyz.c (gacopyz_context_loop): Free req_macros.
(gacopyz_addrcpt_par): rename to gacopyz_add_rcpt_par.
* gacopyz/gacopyz.h (SM_LM_VRS_MAJOR, SM_LM_VRS_MAJOR)
(SM_LM_VRS_PLVL, GACOPYZ_SM_MKVER): New macros.
(macro_index): Rename to gacopyz_stage. All uses updated.
(smfi_version): New proto.
(gacopyz_addrcpt_par): rename to gacopyz_add_rcpt_par.
(gacopyz_stage_name): New declaration.
(gacopyz_srv_get_required_macros): New proto.
(gacopyz_srv_set_version, gacopyz_srv_set_protocol)
(gacopyz_srv_set_actions): 2nd argument is unsigned long.
* gacopyz/server.c (struct gacopyz_srv): New member req_macros.
(gacopyz_srv_get_required_macros): New function.
(gacopyz_srv_destroy): Free req_macros.
(gacopyz_srv_negotiate): Read macros.
* mfd/gram.y (milter_state_name): Removed. Use gacopyz_stage_name instead.

* mtasim/mtasim.c: New options: --gacopyz-log, --milter-proto, --milter-acts.

* doc/mtasim.texi, doc/mailfromd.texi: Update.

14 files changed, 383 insertions, 122 deletions

diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 3f8f893b..fd270c1a 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -12292,12 +12292,13 @@ else but for debugging, as it terribly degrades performance!
 @item --stack-trace
 Add @acronym{MFL} stack trace information to runtime error output.
 Overrides @code{#pragma option stack-trace}, which you are advised to
 use instead (@pxref{pragma stack-trace}).  @xref{tracing runtime
 errors}, for more information on this feature.
 
+@anchor{gacopyz-log option}
 @opsummary{gacopyz-log}
 @item --gacopyz-log=@var{level}
 Set desired logging level for @command{gacopyz} library
 (@pxref{Gacopyz}).  There are five logging levels.  The following
 table lists them in order of decreasing priority:
 
@@ -12323,26 +12324,29 @@ Apr 28 09:00:11 host mailfromd[9411]: finishing
     connection
 @end smallexample
 
 This level can be useful for debugging your scripts.
 
 @item debug
-Log debugging information.  This level prints huge amounts of
+Log debugging information.
+
+@item proto
+Log Milter protocol interactions.  This level prints huge amounts of
 information, in particular it displays dumps of each Milter packet
 sent and received.
 
 @end table
 
 Although it is possible to set these levels independently of each
 other, it is seldom practical.  Therefore, the option
 @option{--gacopyz-log=@var{level}} enables all logging levels from
 @var{level} up.  For example, @option{--gacopyz-log=warn} enables
 log levels @samp{warn}, @samp{err} and @samp{fatal}.  It is the
 default.  If you need to trace each subprocess startup and shutdown,
 set @option{--gacopyz-log=info}.  Setting the logging level to
-@samp{debug} can be needed only for @command{Gacopyz} developers, to
+@samp{proto} can be needed only for @command{Gacopyz} developers, to
 debug the protocol.
 
 @xref{Testing Filter Scripts}.
 
 @opsummary{log-facility}
 @item --log-facility=@var{facility}
diff --git a/doc/mtasim.texi b/doc/mtasim.texi
index a8849fea..513d045d 100644
--- a/doc/mtasim.texi
+++ b/doc/mtasim.texi
@@ -451,12 +451,20 @@ cases.
 @mtindex D, -D, @command{mtasim} option, summary
 @item --define=@var{macro}=@var{value}
 @itemx -D @var{macro}=@var{value}
   Define Sendmail macro @var{macro} to the given @var{value}.  It is
 similar to the @code{\D} administrative command (@pxref{D command})
 
+@mtasimopt{gacopyz-log, summary}
+@item --gacopyz-log=@var{level}
+Set desired logging level for @command{gacopyz} library
+(@pxref{Gacopyz}).  @xref{gacopyz-log option}, for a detailed
+description of @var{level}.  Notice, that unless this option is used,
+the @option{--verbose} (@option{-v}) command line option implies
+@option{--gacopyz-log=debug}.
+
 @mtasimopt{group, summary}
 @mtindex g, -g, @command{mtasim} option, summary
 @item --group=@var{name}
 @itemx -g @var{name}
 When switching to user's privileges as requested by the
 @option{--user} command line option, retain the additional group
@@ -473,17 +481,35 @@ privileges.
 
 @item --help
 @itemx -?
   Display a short help summary
 
 @mtasimopt{milter-version, summary}
-@item --milter-version=@var{number}
-  Force using the given Milter protocol version number.  This option
+@item --milter-version=@var{version}
+  Force using the given Milter protocol version number.  The
+@var{version} argument is either a numeric version (e.g. @samp{2}), or
+a version string in form @samp{@var{major}.@var{minor}[.@var{patch}]},
+where square brackets indicate optional part.  The default is
+@samp{1.0.0}.  If @var{version} is any of @samp{2}, @samp{3} or
+@samp{1.0.0}, the default protocol capabilities and actions for that
+version are set automatically.  This option
 is intended for development and testing of the Gacopyz library
 (@pxref{Gacopyz}).
 
+@mtasimopt{milter-proto, summary}
+@item --milter-proto=@var{bitmask}
+Set Milter protocol capabilities.  See @file{gacopyz/gacopyz.h} for
+the meaning of various bits in the @var{bitmask}.  Look for the C
+macros with the prefix @samp{SMFIP_}.
+
+@mtasimopt{milter-actions, summary}
+@item --milter-actions=@var{bitmask}
+Set Milter actions.  See @file{gacopyz/gacopyz.h} for
+the meaning of various bits in the @var{bitmask}.  Look for the C
+macros with the prefix @samp{SMFIF_}.
+
 @mtasimopt{no-interactive, summary}
 @item --no-interactive
   Not-interactive mode (disable readline).  @xref{Command Line Editing, ,
 Command Line Editing, readline, GNU Readline Library}.
 
 @mtasimopt{port, summary}
@@ -517,13 +543,14 @@ is the default mode for @command{mtasim}.  @xref{interactive mode}.
   Display option summary
 
 @mtasimopt{verbose, summary}  
 @mtindex v, -v, @command{mtasim} option, summary
 @item --verbose
 @itemx -v
-  Increase verbosity level.
+  Increase verbosity level.  Implies @option{--gacopyz-log=debug},
+unless that option is used explicitly.
 
 @item --version
 @itemx -V
   Print program version
 
 @end table
diff --git a/gacopyz/Makefile.am b/gacopyz/Makefile.am
index 7d8c012b..d658b3e7 100644
--- a/gacopyz/Makefile.am
+++ b/gacopyz/Makefile.am
@@ -24,12 +24,13 @@ libgacopyz_a_SOURCES = \
  context.c\
  io.c\
  log.c\
  mfapi.h\
  proc.c\
  server.c\
+ stagenames.c\
  trans.h
 
 EXTRA_DIST=trans.tab trans.awk
 BUILT_SOURCES=trans.h
 INCLUDES=-I$(top_srcdir)/gnu -I../gnu
 
diff --git a/gacopyz/context.c b/gacopyz/context.c
index 41d64c44..12094fdf 100644
--- a/gacopyz/context.c
+++ b/gacopyz/context.c
@@ -1,8 +1,8 @@
 /* This file is part of gacopyz.
-   Copyright (C) 2006, 2007 Sergey Poznyakoff
+   Copyright (C) 2006, 2007, 2009 Sergey Poznyakoff
 
    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 3, or (at your option)
    any later version.
 
@@ -47,13 +47,13 @@ gacopyz_getsymval(SMFICTX *ctx, const char *name)