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, 380 insertions, 119 deletions

diff --git a/doc/mailfromd.texi b/doc/mailfromd.texi
index 3f8f893b..fd270c1a 100644
--- a/doc/mailfromd.texi
+++ b/doc/mailfromd.texi
@@ -12295,6 +12295,7 @@ 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
@@ -12326,7 +12327,10 @@ Apr 28 09:00:11 host mailfromd[9411]: finishing
 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.
 
@@ -12339,7 +12343,7 @@ other, it is seldom practical.  Therefore, the option
 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}.
diff --git a/doc/mtasim.texi b/doc/mtasim.texi
index a8849fea..513d045d 100644
--- a/doc/mtasim.texi
+++ b/doc/mtasim.texi
@@ -454,6 +454,14 @@ cases.
   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}
@@ -476,11 +484,29 @@ privileges.
   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, ,
@@ -520,7 +546,8 @@ is the default mode for @command{mtasim}.  @xref{interactive mode}.
 @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
diff --git a/gacopyz/Makefile.am b/gacopyz/Makefile.am
index 7d8c012b..d658b3e7 100644
--- a/gacopyz/Makefile.am
+++ b/gacopyz/Makefile.am
@@ -27,6 +27,7 @@ libgacopyz_a_SOURCES = \
  mfapi.h\
  proc.c\
  server.c\
+ stagenames.c\
  trans.h
 
 EXTRA_DIST=trans.tab trans.awk
diff --git a/gacopyz/context.c b/gacopyz/context.c
index 41d64c44..12094fdf 100644
--- a/gacopyz/context.c
+++ b/gacopyz/context.c
@@ -1,5 +1,5 @@
 /* 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
@@ -50,7 +50,7 @@ gacopyz_getsymval(SMFICTX *ctx, const char *name)
         if (name[len-1] == '}')
                 len--;
         
-        for (i = maci_max - 1; i >= 0; i--) {
+        for (i = gacopyz_stage_max - 1; i >= 0; i--) {
                 if (ctx->macros[i].argv) {
                         char **p;
 
diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c
index f29681be..e26f7e2e 100644
--- a/gacopyz/gacopyz.c
+++ b/gacopyz/gacopyz.c
@@ -764,7 +764,7 @@ make_optneg_buf(SMFICTX *ctx, gacopyz_uint32_t *vbuf,
         size_t bufsize = 0;
         int i;
         
-        for (i = 0; i < maci_max; i++) {
+        for (i = 0; i < gacopyz_stage_max; i++) {
                 if (ctx->req_macros[i])
                         bufsize += strlen(ctx->req_macros[i]) + 1 +
                                      sizeof(gacopyz_uint32_t);
@@ -789,7 +789,7 @@ make_optneg_buf(SMFICTX *ctx, gacopyz_uint32_t *vbuf,
                 *pbuf = buf;
 
                 buf += OPTLEN;
-                for (i = 0; i < maci_max; i++) {
+                for (i = 0; i < gacopyz_stage_max; i++) {
                         if (ctx->req_macros[i]) {
                                 gacopyz_uint32_t v;
                                 size_t len;
@@ -901,7 +901,7 @@ macro_assoc_free(macro_assoc_t *p)
 static void
 clear_macros(SMFICTX *ctx, int i)
 {
-        for (; i < maci_max; i++)
+        for (; i < gacopyz_stage_max; i++)
                 macro_assoc_free(&ctx->macros[i]);
 }
 
@@ -962,7 +962,7 @@ shan_abort(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
 static state_ret_type
 shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
 {
-        enum macro_index ind;
+        enum gacopyz_stage ind;
         char **p;
         
         if (!arg->argv.v)
@@ -970,31 +970,31 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
 
         switch (arg->argv.cmd) {
         case SMFIC_CONNECT:
-                ind = maci_conn;
+                ind = gacopyz_stage_conn;