[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU Mailutils branch, master, updated. release-2.2-560-g356c075
|
From: |
Sergey Poznyakoff |
|
Subject: |
[SCM] GNU Mailutils branch, master, updated. release-2.2-560-g356c075 |
|
Date: |
Fri, 30 Dec 2011 22:43:13 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Mailutils".
http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=356c07542f39f1ff159e2646bd97e1791f493aad
The branch, master has been updated
via 356c07542f39f1ff159e2646bd97e1791f493aad (commit)
from d4dd5a8a5777be7ba655b87b483659206ea0cf54 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 356c07542f39f1ff159e2646bd97e1791f493aad
Author: Sergey Poznyakoff <address@hidden>
Date: Sat Dec 31 00:37:46 2011 +0200
Add SMTP test.
* examples/mta.c: Handle -bD option. Detach from the controlling
terminal if -bd is given. Print pid and port number in this case.
* testsuite/smtpsend.c: Fix handling of the trace= option.
* testsuite/Makefile.am: Add new tests.
* testsuite/smtp-msg.at: New test case.
* testsuite/smtp-str.at: New test case.
* testsuite/testsuite.at: Include new test cases.
-----------------------------------------------------------------------
Summary of changes:
examples/mta.c | 161 ++++++++++++++++++++++++++++++++++++-----------
testsuite/Makefile.am | 2 +
testsuite/smtp-msg.at | 61 ++++++++++++++++++
testsuite/smtp-str.at | 62 ++++++++++++++++++
testsuite/smtpsend.c | 14 +++-
testsuite/testsuite.at | 4 +
6 files changed, 262 insertions(+), 42 deletions(-)
create mode 100644 testsuite/smtp-msg.at
create mode 100644 testsuite/smtp-str.at
diff --git a/examples/mta.c b/examples/mta.c
index 4008f78..3cdd7f2 100644
--- a/examples/mta.c
+++ b/examples/mta.c
@@ -27,13 +27,21 @@
recipients.
2. mta -bd [-p port]
-
+ mta -bD [-p port]
+
Operates as daemon. If port is given, mta will listen on that port.
Otherwise, it will use the first free port in the range 1024-65535.
- In this case, mta prints the port number on the stdout, prior to
- starting operation. Notice, that in this mode mta does not disconnect
- itself from the controlling terminal, it always stays on the foreground.
+ If the -bd option is given, mta switches to the background and prints
+ its PID and port number on two separate lines on the stdout. It then
+ listens for incoming connections for no more than 60 seconds.
+
+ If the -bD option is given, the utility prints the port number and
+ listens for incoming connections not detaching itself from the controlling
+ terminal.
+ In any case, at most one connection is served, after which the utility
+ terminates.
+
Environment variables:
MTA_DOMAIN Sets the default domain name for email addresses. Default
@@ -66,12 +74,13 @@
FILE *diag = NULL; /* diagnostic output */
int smtp_mode; /* Operate in smtp mode */
int port = 0; /* Port number (for smtp mode) */
+int foreground = 0; /* Stay in the foreground (smtp mode) */
char *from_person = NULL; /* Set the name of the `from' person */
int read_recipients = 0; /* Read the message for recipients */
int dot = 1; /* Message is terminated by a lone dot on a line */
mu_address_t recipients = NULL;
-char *progname;
+
/* FIXME: If finalize_option is set, mta should try to finalize
received messages the way sendmail does, i.e. to add To: or
Cc: headers, if they are missing, etc. The code to do so is
@@ -95,9 +104,7 @@ main (int argc, char **argv)
int c, status;
char *domain;
- progname = strrchr (argv[0], '/');
- if (!progname)
- progname = argv[0];
+ mu_set_program_name (argv[0]);
while ((c = getopt (argc, argv, "b:f:p:to:")) != EOF)
{
@@ -110,6 +117,11 @@ main (int argc, char **argv)
smtp_mode = 1;
break;
+ case 'D':
+ smtp_mode = 1;
+ foreground = 1;
+ break;
+
default:
/*FIXME*/;
}
@@ -153,13 +165,13 @@ main (int argc, char **argv)
diag = fopen (name, mode);
if (!diag)
{
- mu_error ("%s: can't open diagnostic output: %s",
- progname, name);
+ mu_error ("can't open diagnostic output %s: %s",
+ name, mu_strerror (errno));
return 1;
}
}
else
- diag = stdout;
+ diag = stderr;
}
register_handlers ();
@@ -226,7 +238,7 @@ make_tmp (mu_stream_t in)
const char *from = from_address ();
if (!from)
{
- mu_error ("%s: can't determine sender address", progname);
+ mu_error ("can't determine sender address");
exit (EX_NOUSER);
}
@@ -301,7 +313,7 @@ address_email_string (mu_address_t addr)
value = malloc (length + 1);
if (!value)
{
- mu_error ("%s: not enough memory", progname);
+ mu_error ("not enough memory");
return NULL;
}
p = value;
@@ -390,7 +402,7 @@ message_finalize (mu_message_t msg, int warn)
sizeof (SENDER_WARNING));
if (warn == NULL)
{
- mu_error ("%s: not enough memory", progname);
+ mu_error ("not enough memory");
return 1;
}
sprintf (warn, "%s %s", pwd->pw_name, SENDER_WARNING);
@@ -406,7 +418,7 @@ message_finalize (mu_message_t msg, int warn)
{
if (add_recipient (value))
{
- mu_error ("%s: bad address %s", progname, value);
+ mu_error ("bad address %s", value);
return 1;
}
free (value);
@@ -416,7 +428,7 @@ message_finalize (mu_message_t msg, int warn)
{
if (add_recipient (value))
{
- mu_error ("%s: bad address %s", progname, value);
+ mu_error ("bad address %s", value);
return 1;
}
free (value);
@@ -427,7 +439,7 @@ message_finalize (mu_message_t msg, int warn)
{
if (add_recipient (value))
{
- mu_error ("%s: bad address %s", progname, value);
+ mu_error ("bad address %s", value);
return 1;
}
free (value);
@@ -443,8 +455,8 @@ message_finalize (mu_message_t msg, int warn)
c = mu_address_sget_printable (recipients, &sptr);
if (c)
{
- mu_error ("%s: mu_address_sget_printable failure: %s",
- progname, mu_strerror (c));
+ mu_error ("mu_address_sget_printable failure: %s",
+ mu_strerror (c));
return 1;
}
mu_header_set_value (header, MU_HEADER_TO, sptr, 1);
@@ -463,7 +475,7 @@ mta_stdin (int argc, char **argv)
{
if (add_recipient (argv[c]))
{
- mu_error ("%s: bad address %s", progname, argv[c]);
+ mu_error ("bad address %s", argv[c]);
return 1;
}
}
@@ -483,7 +495,7 @@ mta_stdin (int argc, char **argv)
if (!recipients)
{
- mu_error ("%s: Recipient names must be specified", progname);
+ mu_error ("recipient names must be specified");
return 1;
}
@@ -501,7 +513,7 @@ smtp_reply (mu_stream_t str, int code, char *fmt, ...)
va_start (ap, fmt);
mu_stream_vprintf (str, fmt, ap);
va_end (ap);
- mu_stream_printf (str, "\r\n");
+ mu_stream_printf (str, "\n");
}
#define STATE_INIT 0
@@ -563,14 +575,22 @@ smtp (mu_stream_t str)
char *rcpt_addr;
int wsflags = MU_WRDSF_DEFFLAGS;
struct mu_wordsplit ws;
-
+
smtp_reply (str, 220, "Ready");
for (state = STATE_INIT; state != STATE_QUIT; )
{
+ int rc;
int kw;
size_t len;
+
+ rc = mu_stream_getline (str, &buf, &size, &len);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_stream_getline", NULL, rc);
+ exit (EX_PROTOCOL);
+ }
- if (mu_stream_getline (str, &buf, &size, &len) || len == 0)
+ if (len == 0)
exit (EX_PROTOCOL);
if (mu_wordsplit (buf, &ws, wsflags))
@@ -702,8 +722,8 @@ smtp (mu_stream_t str)
mu_message_t msg;
int rc;
- rc = mu_filter_create (&flt, str, "CRLFDOT", MU_FILTER_DECODE,
- MU_STREAM_READ|MU_STREAM_WRTHRU);
+ rc = mu_filter_create (&flt, str, "DOT", MU_FILTER_DECODE,
+ MU_STREAM_READ);
if (rc)
{
mu_diag_funcall (MU_DIAG_ERROR, "mu_filter_create",
@@ -738,17 +758,22 @@ smtp (mu_stream_t str)
}
}
+#ifndef INADDR_LOOPBACK
+# define INADDR_LOOPBACK 0x7f000001
+#endif
+
int
mta_smtp (int argc, char **argv)
{
int on = 1;
struct sockaddr_in address;
int fd;
+ pid_t pid;
fd = socket (PF_INET, SOCK_STREAM, 0);
if (fd < 0)
{
- mu_error ("%s: socket: %s", progname, strerror (errno));
+ mu_error ("socket: %s", mu_strerror (errno));
return 1;
}
@@ -756,7 +781,7 @@ mta_smtp (int argc, char **argv)
memset (&address, 0, sizeof (address));
address.sin_family = AF_INET;
- address.sin_addr.s_addr = INADDR_ANY;
+ address.sin_addr.s_addr = htonl (INADDR_LOOPBACK);
if (port)
{
@@ -764,7 +789,7 @@ mta_smtp (int argc, char **argv)
if (bind (fd, (struct sockaddr *) &address, sizeof (address)) < 0)
{
close (fd);
- mu_error ("%s: bind: %s", progname, strerror(errno));
+ mu_error ("bind: %s", mu_strerror (errno));
return 1;
}
}
@@ -777,8 +802,7 @@ mta_smtp (int argc, char **argv)
{
if (++port >= 65535)
{
- mu_error ("%s: can't bind socket: all ports in use?",
- progname);
+ mu_error ("can't bind socket: all ports in use?");
return 1;
}
address.sin_port = htons (port);
@@ -788,8 +812,30 @@ mta_smtp (int argc, char **argv)
}
listen (fd, 5);
- printf ("%d\n", port);
+ if (!foreground)
+ {
+ pid = fork ();
+ if (pid == -1)
+ {
+ mu_error ("fork: %s", mu_strerror (errno));
+ return 1;
+ }
+ if (pid)
+ {
+ /* Master process. */
+ printf ("%lu\n", (unsigned long) pid);
+ printf ("%d\n", port);
+ return 0;
+ }
+ }
+ else
+ printf ("%d\n", port);
+
+ /* Child */
fclose (stdout);
+ if (!foreground)
+ alarm (60);
+
while (1)
{
fd_set rfds;
@@ -797,7 +843,7 @@ mta_smtp (int argc, char **argv)
int sfd, status;
socklen_t len;
int rc;
- mu_stream_t str;
+ mu_stream_t str, istream, ostream, flt;
FD_ZERO (&rfds);
FD_SET (fd, &rfds);
@@ -807,22 +853,61 @@ mta_smtp (int argc, char **argv)
{
if (errno == EINTR)
continue;
- mu_error ("%s: select: %s", progname, strerror (errno));
+ mu_error ("select: %s", mu_strerror (errno));
return 1;
}
len = sizeof (his_addr);
if ((sfd = accept (fd, (struct sockaddr *)&his_addr, &len)) < 0)
{
- mu_error ("%s: accept: %s", progname, strerror (errno));
+ mu_error ("accept: %s", mu_strerror (errno));
return 1;
}
- rc = mu_fd_stream_create (&str, NULL, sfd, MU_STREAM_RDWR);
+ rc = mu_stdio_stream_create (&istream, sfd, MU_STREAM_READ);
if (rc)
{
- mu_diag_funcall (MU_DIAG_ERROR, "mu_fd_stream_create", NULL, rc);
- break;
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_stdio_stream_create",
+ "MU_STREAM_READ", rc);
+ return 1;
+ }
+ mu_stream_set_buffer (istream, mu_buffer_line, 0);
+ rc = mu_filter_create (&flt, istream, "CRLF", MU_FILTER_DECODE,
+ MU_STREAM_READ);
+ mu_stream_unref (istream);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_filter_create",
+ "CRLF,MU_FILTER_DECODE", rc);
+ return 1;
+ }
+ mu_stream_set_buffer (flt, mu_buffer_line, 0);
+ istream = flt;
+
+ rc = mu_stdio_stream_create (&ostream, sfd, MU_STREAM_WRITE);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_stdio_stream_create",
+ "MU_STREAM_WRITE", rc);
+ return 1;
+ }
+ mu_stream_set_buffer (ostream, mu_buffer_line, 0);
+ rc = mu_filter_create (&flt, ostream, "CRLF", MU_FILTER_ENCODE,
+ MU_STREAM_WRITE);
+ mu_stream_unref (ostream);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_filter_create",
+ "CRLF,MU_FILTER_ENCODE", rc);
+ return 1;
+ }
+ mu_stream_set_buffer (flt, mu_buffer_line, 0);
+ ostream = flt;
+ rc = mu_iostream_create (&str, istream, ostream);
+ if (rc)
+ {
+ mu_diag_funcall (MU_DIAG_ERROR, "mu_iostream_create", NULL, rc);
+ return 1;
}
mu_stream_set_buffer (str, mu_buffer_line, 0);
smtp (str);
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index f115a86..377131d 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -87,6 +87,8 @@ TESTSUITE_AT = \
lstuid02.at\
mbdel.at\
mime.at\
+ smtp-msg.at\
+ smtp-str.at\
ufms.at\
testsuite.at
diff --git a/testsuite/smtp-msg.at b/testsuite/smtp-msg.at
new file mode 100644
index 0000000..5e1a115
--- /dev/null
+++ b/testsuite/smtp-msg.at
@@ -0,0 +1,61 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# GNU Mailutils 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.
+#
+# GNU Mailutils 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 GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([smtp send from message])
+AT_KEYWORDS([smtp-msg])
+
+AT_DATA([msg],[dnl
+From: address@hidden
+To: address@hidden
+Subject: SMTP test
+
+Omnis enim res, quae dando non deficit,
+dum habetur et non datur, nondum habetur,
+quomodo habenda est.
+])
+
+AT_CHECK([
+MTA_DIAG=`pwd`/mta.diag
+export MTA_DIAG
+p=`$abs_top_builddir/examples/mta -bd`
+test $? -eq 0 || AT_SKIP_TEST
+set -- $p
+# $1 - pid, $2 - port
+smtpsend localhost port=$2 \
+ address@hidden
+ address@hidden
+ domain=mailutils.org\
+ input=msg
+kill $1
+cat mta.diag
+],
+[0],
+[ENVELOPE FROM: <address@hidden>
+ENVELOPE TO: <address@hidden>
+ 0: From: address@hidden
+ 1: To: address@hidden
+ 2: Subject: SMTP test
+ 3:
+ 4: Omnis enim res, quae dando non deficit,
+ 5: dum habetur et non datur, nondum habetur,
+ 6: quomodo habenda est.
+ 7:
+END OF MESSAGE
+])
+
+AT_CLEANUP
+
+
\ No newline at end of file
diff --git a/testsuite/smtp-str.at b/testsuite/smtp-str.at
new file mode 100644
index 0000000..4568e5f
--- /dev/null
+++ b/testsuite/smtp-str.at
@@ -0,0 +1,62 @@
+# This file is part of GNU Mailutils. -*- Autotest -*-
+# Copyright (C) 2011 Free Software Foundation, Inc.
+#
+# GNU Mailutils 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.
+#
+# GNU Mailutils 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 GNU Mailutils. If not, see <http://www.gnu.org/licenses/>.
+
+AT_SETUP([smtp send from stream])
+AT_KEYWORDS([smtp-stream smtp-str])
+
+AT_DATA([msg],[dnl
+From: address@hidden
+To: address@hidden
+Subject: SMTP test
+
+Omnis enim res, quae dando non deficit,
+dum habetur et non datur, nondum habetur,
+quomodo habenda est.
+])
+
+AT_CHECK([
+MTA_DIAG=`pwd`/mta.diag
+export MTA_DIAG
+p=`$abs_top_builddir/examples/mta -bd`
+test $? -eq 0 || AT_SKIP_TEST
+set -- $p
+# $1 - pid, $2 - port
+smtpsend localhost port=$2 \
+ address@hidden
+ address@hidden
+ domain=mailutils.org\
+ raw=1\
+ input=msg
+kill $1
+cat mta.diag
+],
+[0],
+[ENVELOPE FROM: <address@hidden>
+ENVELOPE TO: <address@hidden>
+ 0: From: address@hidden
+ 1: To: address@hidden
+ 2: Subject: SMTP test
+ 3:
+ 4: Omnis enim res, quae dando non deficit,
+ 5: dum habetur et non datur, nondum habetur,
+ 6: quomodo habenda est.
+ 7:
+END OF MESSAGE
+])
+
+AT_CLEANUP
+
+
\ No newline at end of file
diff --git a/testsuite/smtpsend.c b/testsuite/smtpsend.c
index 9dcc4e7..7e721ea 100644
--- a/testsuite/smtpsend.c
+++ b/testsuite/smtpsend.c
@@ -120,10 +120,16 @@ main (int argc, char **argv)
if (mu_isdigit (arg[0]))
mu_smtp_trace (smtp, atoi (argv[i] + 6) ?
MU_SMTP_TRACE_SET : MU_SMTP_TRACE_CLR);
- else if (strcmp (arg, "secure") == 0)
- mu_smtp_trace_mask (smtp, MU_SMTP_TRACE_SET, MU_XSCRIPT_SECURE);
- else if (strcmp (arg, "payload") == 0)
- mu_smtp_trace_mask (smtp, MU_SMTP_TRACE_SET, MU_XSCRIPT_PAYLOAD);
+ else
+ {
+ mu_smtp_trace (smtp, MU_SMTP_TRACE_SET);
+ if (strcmp (arg, "secure") == 0)
+ mu_smtp_trace_mask (smtp, MU_SMTP_TRACE_SET,
+ MU_XSCRIPT_SECURE);
+ else if (strcmp (arg, "payload") == 0)
+ mu_smtp_trace_mask (smtp, MU_SMTP_TRACE_SET,
+ MU_XSCRIPT_PAYLOAD);
+ }
}
else if (strncmp (argv[i], "tls=", 4) == 0)
tls = atoi (argv[i] + 4);
diff --git a/testsuite/testsuite.at b/testsuite/testsuite.at
index 87f80dc..476751d 100644
--- a/testsuite/testsuite.at
+++ b/testsuite/testsuite.at
@@ -32,5 +32,9 @@ m4_include([mbdel.at])
AT_BANNER(Folder mailbox removal)
m4_include([fldel.at])
+AT_BANNER(SMTP)
+m4_include([smtp-msg.at])
+m4_include([smtp-str.at])
+
AT_BANNER(Various)
m4_include([ufms.at])
hooks/post-receive
--
GNU Mailutils
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU Mailutils branch, master, updated. release-2.2-560-g356c075,
Sergey Poznyakoff <=