Mageia Bugzilla – Attachment 5177 Details for
Bug 13435
systemd socket activation support for libmilter
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
systemd-like fd passing to libmilter
fd-passing-libmilter.patch (text/plain), 2.53 KB, created by
Mikhail Gusarov
on 2014-05-25 10:55:51 CEST
(
hide
)
Description:
systemd-like fd passing to libmilter
Filename:
MIME Type:
Creator:
Mikhail Gusarov
Created:
2014-05-25 10:55:51 CEST
Size:
2.53 KB
patch
obsolete
>Description: systemd-like socket activation support for libmilter >Author: Mikhail Gusarov <dottedmag@debian.org >diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html >index 70a510e..013f04e 100644 >--- a/libmilter/docs/smfi_setconn.html >+++ b/libmilter/docs/smfi_setconn.html >@@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail. > <LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe. > <LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket. > <LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket. >+ <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor. > </UL> > </TD></TR> > </TABLE> >diff --git a/libmilter/listener.c b/libmilter/listener.c >index 48c552f..2249a1f 100644 >--- a/libmilter/listener.c >+++ b/libmilter/listener.c >@@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name) > L_socksize = sizeof addr.sin6; > } > #endif /* NETINET6 */ >+ else if (strcasecmp(p, "fd") == 0) >+ { >+ addr.sa.sa_family = AF_UNSPEC; >+ L_socksize = sizeof (_SOCK_ADDR); >+ } > else > { > smi_log(SMI_LOG_ERR, "%s: unknown socket type %s", >@@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name) > } > #endif /* NETINET || NETINET6 */ > >- sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); >+ if (addr.sa.sa_family == AF_UNSPEC) >+ { >+ char *end; >+ sock = strtol(colon, &end, 10); >+ if (*end != '\0' || sock < 0) >+ { >+ smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon); >+ return INVALID_SOCKET; >+ } >+ } >+ else >+ { >+ sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); >+ } >+ > if (!ValidSocket(sock)) > { > smi_log(SMI_LOG_ERR, >@@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name) > #if NETUNIX > addr.sa.sa_family != AF_UNIX && > #endif /* NETUNIX */ >+ addr.sa.sa_family != AF_UNSPEC && > setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt, > sizeof(sockopt)) == -1) > { >@@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name) > } > #endif /* NETUNIX */ > >- if (bind(sock, &addr.sa, L_socksize) < 0) >+ if (addr.sa.sa_family != AF_UNSPEC && >+ bind(sock, &addr.sa, L_socksize) < 0) > { > smi_log(SMI_LOG_ERR, > "%s: Unable to bind to port %s: %s", >@@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog) > # ifdef BSD4_4_SOCKADDR > cliaddr.sa.sa_len == 0 || > # endif /* BSD4_4_SOCKADDR */ >- cliaddr.sa.sa_family != L_family)) >+ (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family))) > { > (void) closesocket(connfd); > connfd = INVALID_SOCKET;
Description: systemd-like socket activation support for libmilter Author: Mikhail Gusarov <dottedmag@debian.org diff --git a/libmilter/docs/smfi_setconn.html b/libmilter/docs/smfi_setconn.html index 70a510e..013f04e 100644 --- a/libmilter/docs/smfi_setconn.html +++ b/libmilter/docs/smfi_setconn.html @@ -43,6 +43,7 @@ Set the socket through which this filter should communicate with sendmail. <LI><CODE>{unix|local}:/path/to/file</CODE> -- A named pipe. <LI><CODE>inet:port@{hostname|ip-address}</CODE> -- An IPV4 socket. <LI><CODE>inet6:port@{hostname|ip-address}</CODE> -- An IPV6 socket. + <LI><CODE>fd:number</CODE> -- Pre-opened file descriptor. </UL> </TD></TR> </TABLE> diff --git a/libmilter/listener.c b/libmilter/listener.c index 48c552f..2249a1f 100644 --- a/libmilter/listener.c +++ b/libmilter/listener.c @@ -197,6 +197,11 @@ mi_milteropen(conn, backlog, rmsocket, name) L_socksize = sizeof addr.sin6; } #endif /* NETINET6 */ + else if (strcasecmp(p, "fd") == 0) + { + addr.sa.sa_family = AF_UNSPEC; + L_socksize = sizeof (_SOCK_ADDR); + } else { smi_log(SMI_LOG_ERR, "%s: unknown socket type %s", @@ -443,7 +448,21 @@ mi_milteropen(conn, backlog, rmsocket, name) } #endif /* NETINET || NETINET6 */ - sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); + if (addr.sa.sa_family == AF_UNSPEC) + { + char *end; + sock = strtol(colon, &end, 10); + if (*end != '\0' || sock < 0) + { + smi_log(SMI_LOG_ERR, "%s: expected positive integer as fd, got %s", name, colon); + return INVALID_SOCKET; + } + } + else + { + sock = socket(addr.sa.sa_family, SOCK_STREAM, 0); + } + if (!ValidSocket(sock)) { smi_log(SMI_LOG_ERR, @@ -466,6 +485,7 @@ mi_milteropen(conn, backlog, rmsocket, name) #if NETUNIX addr.sa.sa_family != AF_UNIX && #endif /* NETUNIX */ + addr.sa.sa_family != AF_UNSPEC && setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (void *) &sockopt, sizeof(sockopt)) == -1) { @@ -511,7 +531,8 @@ mi_milteropen(conn, backlog, rmsocket, name) } #endif /* NETUNIX */ - if (bind(sock, &addr.sa, L_socksize) < 0) + if (addr.sa.sa_family != AF_UNSPEC && + bind(sock, &addr.sa, L_socksize) < 0) { smi_log(SMI_LOG_ERR, "%s: Unable to bind to port %s: %s", @@ -817,7 +838,7 @@ mi_listener(conn, dbg, smfi, timeout, backlog) # ifdef BSD4_4_SOCKADDR cliaddr.sa.sa_len == 0 || # endif /* BSD4_4_SOCKADDR */ - cliaddr.sa.sa_family != L_family)) + (L_family != AF_UNSPEC && cliaddr.sa.sa_family != L_family))) { (void) closesocket(connfd); connfd = INVALID_SOCKET;
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 13435
: 5177