MINOR: log: add a target type instead of hacking the address family
Instead of detecting an AF_UNSPEC address family for a log server and
to deduce a file descriptor, let's create a target type field and
explicitly mention that the socket is of type FD.
diff --git a/include/types/log.h b/include/types/log.h
index affcd92..dbbd73b 100644
--- a/include/types/log.h
+++ b/include/types/log.h
@@ -47,6 +47,12 @@
LOG_FORMATS, /* number of supported log formats, must always be last */
};
+/* log target types */
+enum log_tgt {
+ LOG_TARGET_DGRAM = 0, // datagram address (udp, unix socket)
+ LOG_TARGET_FD, // file descriptor
+};
+
/* lists of fields that can be logged */
enum {
@@ -197,6 +203,7 @@
struct list list;
struct sockaddr_storage addr;
struct smp_info lb;
+ enum log_tgt type;
int format;
int facility;
int level;
diff --git a/src/log.c b/src/log.c
index 9011724..1b34c63 100644
--- a/src/log.c
+++ b/src/log.c
@@ -999,6 +999,10 @@
}
/* now, back to the address */
+ logsrv->type = LOG_TARGET_DGRAM;
+ if (strncmp(args[1], "fd@", 3) == 0)
+ logsrv->type = LOG_TARGET_FD;
+
sk = str2sa_range(args[1], NULL, &port1, &port2, err, NULL, NULL, 1);
if (!sk)
goto error;
@@ -1502,7 +1506,7 @@
dataptr = message;
- if (logsrv->addr.ss_family == AF_UNSPEC) {
+ if (logsrv->type == LOG_TARGET_FD) {
/* the socket's address is a file descriptor */
plogfd = (int *)&((struct sockaddr_in *)&logsrv->addr)->sin_addr.s_addr;
}