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
@@ -12297,2 +12297,3 @@ errors}, for more information on this feature.
 
+@anchor{gacopyz-log option}
 @opsummary{gacopyz-log}
@@ -12328,3 +12329,6 @@ 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
@@ -12341,3 +12345,3 @@ 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.
diff --git a/doc/mtasim.texi b/doc/mtasim.texi
index a8849fea..513d045d 100644
--- a/doc/mtasim.texi
+++ b/doc/mtasim.texi
@@ -456,2 +456,10 @@ 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}
@@ -478,4 +486,10 @@ privileges.
 @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
@@ -483,2 +497,14 @@ is intended for development and testing of the Gacopyz library
 
+@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}
@@ -522,3 +548,4 @@ is the default mode for @command{mtasim}.  @xref{interactive mode}.
 @itemx -v
-  Increase verbosity level.
+  Increase verbosity level.  Implies @option{--gacopyz-log=debug},
+unless that option is used explicitly.
 
diff --git a/gacopyz/Makefile.am b/gacopyz/Makefile.am
index 7d8c012b..d658b3e7 100644
--- a/gacopyz/Makefile.am
+++ b/gacopyz/Makefile.am
@@ -29,2 +29,3 @@ libgacopyz_a_SOURCES = \
  server.c\
+ stagenames.c\
  trans.h
diff --git a/gacopyz/context.c b/gacopyz/context.c
index 41d64c44..12094fdf 100644
--- a/gacopyz/context.c
+++ b/gacopyz/context.c
@@ -1,3 +1,3 @@
 /* This file is part of gacopyz.
-   Copyright (C) 2006, 2007 Sergey Poznyakoff
+   Copyright (C) 2006, 2007, 2009 Sergey Poznyakoff
 
@@ -52,3 +52,3 @@ gacopyz_getsymval(SMFICTX *ctx, const char *name)
         
-        for (i = maci_max - 1; i >= 0; i--) {
+        for (i = gacopyz_stage_max - 1; i >= 0; i--) {
                 if (ctx->macros[i].argv) {
diff --git a/gacopyz/gacopyz.c b/gacopyz/gacopyz.c
index f29681be..e26f7e2e 100644
--- a/gacopyz/gacopyz.c
+++ b/gacopyz/gacopyz.c
@@ -766,3 +766,3 @@ make_optneg_buf(SMFICTX *ctx, gacopyz_uint32_t *vbuf,
         
-        for (i = 0; i < maci_max; i++) {
+        for (i = 0; i < gacopyz_stage_max; i++) {
                 if (ctx->req_macros[i])
@@ -791,3 +791,3 @@ make_optneg_buf(SMFICTX *ctx, gacopyz_uint32_t *vbuf,
                 buf += OPTLEN;
-                for (i = 0; i < maci_max; i++) {
+                for (i = 0; i < gacopyz_stage_max; i++) {
                         if (ctx->req_macros[i]) {
@@ -903,3 +903,3 @@ clear_macros(SMFICTX *ctx, int i)
 {
-        for (; i < maci_max; i++)
+        for (; i < gacopyz_stage_max; i++)
                 macro_assoc_free(&ctx->macros[i]);
@@ -964,3 +964,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
 {
-        enum macro_index ind;
+        enum gacopyz_stage ind;
         char **p;
@@ -972,3 +972,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_CONNECT:
-                ind = maci_conn;
+                ind = gacopyz_stage_conn;
                 break;
@@ -976,3 +976,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_HELO:
-                ind = maci_helo;
+                ind = gacopyz_stage_helo;
                 break;
@@ -980,3 +980,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_MAIL:
-                ind = maci_mail;
+                ind = gacopyz_stage_mail;
                 break;
@@ -984,3 +984,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_RCPT:
-                ind = maci_rcpt;
+                ind = gacopyz_stage_rcpt;
                 break;
@@ -988,3 +988,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_DATA:
-                ind = maci_data;
+                ind = gacopyz_stage_data;
                 break;
@@ -992,3 +992,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_BODYEOB:
-                ind = maci_eom;
+                ind = gacopyz_stage_eom;
                 break;
@@ -996,3 +996,3 @@ shan_macro(SMFICTX *ctx, union state_arg *arg, unsigned char *cmd)
         case SMFIC_EOH:
-                ind = maci_eoh;
+                ind = gacopyz_stage_eoh;
                 break;
@@ -1348,29 +1348,29 @@ static struct state_disp disp[] = {
   { SMFIC_ABORT,   "abort",
-    arg_no_args,     shan_abort,   st_abrt, CT_CNT, maci_none },
+    arg_no_args,     shan_abort,   st_abrt, CT_CNT, gacopyz_stage_none },
   { SMFIC_MACRO,   "macro",
-    arg_argvc,       shan_macro,   st_none, CT_CNT, maci_none },
+    arg_argvc,       shan_macro,   st_none, CT_CNT, gacopyz_stage_none },
   { SMFIC_BODY,    "body",
-    arg_one_string,  shan_body,    st_body, CT_CNT, maci_none },
+    arg_one_string,  shan_body,    st_body, CT_CNT, gacopyz_stage_none },
   { SMFIC_CONNECT, "connect",
-    arg_two_strings, shan_connect, st_conn, CT_CLR, maci_conn },
+    arg_two_strings, shan_connect, st_conn, CT_CLR, gacopyz_stage_conn },
   { SMFIC_BODYEOB, "endm",
-    arg_one_string,  shan_endm,    st_endm, CT_CNT, maci_eom  },
+    arg_one_string,  shan_endm,    st_endm, CT_CNT, gacopyz_stage_eom  },
   { SMFIC_HELO,    "helo",
-    arg_one_string,  shan_helo,    st_helo, CT_CLR, maci_helo },
+    arg_one_string,  shan_helo,    st_helo, CT_CLR, gacopyz_stage_helo },
   { SMFIC_HEADER,  "header",
-    arg_two_strings, shan_header,  st_hdrs, CT_CNT, maci_none },
+    arg_two_strings, shan_header,  st_hdrs, CT_CNT, gacopyz_stage_none },
   { SMFIC_MAIL,    "mail",
-    arg_argv,        shan_mail,    st_mail, CT_CLR, maci_mail },
+    arg_argv,        shan_mail,    st_mail, CT_CLR, gacopyz_stage_mail },
   { SMFIC_OPTNEG,  "optneg",
-    arg_ints,        shan_optneg,  st_opts, CT_CNT, maci_none },
+    arg_ints,        shan_optneg,  st_opts, CT_CNT, gacopyz_stage_none },
   { SMFIC_EOH,     "eoh",
-    arg_no_args,     shan_eoh,     st_eohs, CT_CNT, maci_none },
+    arg_no_args,     shan_eoh,     st_eohs, CT_CNT, gacopyz_stage_none },
   { SMFIC_QUIT,    "quit",
-    arg_no_args,     shan_quit,    st_quit, CT_END, maci_none },
+    arg_no_args,     shan_quit,    st_quit, CT_END, gacopyz_stage_none },
   { SMFIC_DATA,    "data",
-    arg_no_args,     shan_data,    st_data, CT_CNT, maci_none },
+    arg_no_args,     shan_data,    st_data, CT_CNT, gacopyz_stage_non