diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-11-01 10:56:08 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-11-01 10:56:08 +0200 |
commit | 4e7bcdbae346a26c1addf266a23c1f6cdc74533f (patch) | |
tree | 30f6721129f8a7688814b9dc88727e810770fbda /libmailutils/stream/tcp.c | |
parent | a5e929972db1342beec4b8f577399f2d8d9a76c2 (diff) | |
download | mailutils-4e7bcdbae346a26c1addf266a23c1f6cdc74533f.tar.gz mailutils-4e7bcdbae346a26c1addf266a23c1f6cdc74533f.tar.bz2 |
Improve socket and SMTP client API
Split formatting functions into two distinct families. Functions prefixed
with mu_sys_sockadrr deal with struct sockaddr, wherease those starting with
mu_sockaddr deal with struct mu_sockaddr. Introduce special format for SMTP
EHLO.
When sending EHLO to the remote party, use IP address in square brackets
if hostname is empty.
* libmailutils/sockaddr/Makefile.am (libsockaddr_la_SOURCES): Add fromsock.c
* libmailutils/sockaddr/fromsock.c: New function.
* libmailutils/sockaddr/str.c (mu_sockaddr_format): Rewrite.
(mu_sys_sockaddr_format,mu_sys_sockaddr_to_astr): New functions.
* include/mailutils/debug.h (mu_sockaddr_to_astr): Remove prototype.
* include/mailutils/sockaddr.h (mu_sockaddr_format): New enum.
(mu_sockaddr_format): change signature.
(mu_sys_sockaddr_format,mu_sys_sockaddr_to_astr): New prototypes.
(mu_sockaddr_from_socket): New prototype.
* include/mailutils/stream.h (MU_IOCTL_TCPSTREAM): New ioctl family;
(MU_IOCTL_TCP_GETSOCKNAME): New ioctl opcode.
* comsat/comsat.c: Use mu_sys_sockaddr_ interface to handle
struct sockaddr.
* lib/tcpwrap.c: Likewise.
* libmailutils/server/ipsrv.c: Likewise.
* libmailutils/server/msrv.c: Likewise.
* libmailutils/stream/tcp.c (_tcp_ioctl): Handle MU_IOCTL_TCPSTREAM.
* libproto/mailer/smtp_ehlo.c (mu_smtp_ehlo): If hostname is empty,
use IP address in square brackets.
Diffstat (limited to 'libmailutils/stream/tcp.c')
-rw-r--r-- | libmailutils/stream/tcp.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libmailutils/stream/tcp.c b/libmailutils/stream/tcp.c index 2bfae34bb..718135539 100644 --- a/libmailutils/stream/tcp.c +++ b/libmailutils/stream/tcp.c @@ -177,6 +177,25 @@ _tcp_ioctl (mu_stream_t stream, int code, int opcode, void *ptr) } } break; + + case MU_IOCTL_TCPSTREAM: + switch (opcode) + { + case MU_IOCTL_TCP_GETSOCKNAME: + if (!ptr) + return EINVAL; + if (!tcp->source_addr) + { + int rc = mu_sockaddr_from_socket (&tcp->source_addr, tcp->fd); + if (rc) + return rc; + } + return mu_sockaddr_copy ((struct mu_sockaddr **)ptr, + tcp->source_addr); + default: + return EINVAL; + } + break; default: return ENOSYS; |