shrink mog_packaddr and improve portability

We cannot assume sa_family_t is the first element of "struct
sockaddr_in" or "struct sockaddr_in6".  FreeBSD has a "sa_len"
member as the first element while Linux does not.

So only keep the parts of the "struct sockaddr*" we need and use
inet_ntop instead of getnameinfo.  This also gives us a little more
space to add additional fields to "struct mog_http" in the future
without increasing memory (or CPU cache) use.

1 files changed, 3 insertions, 9 deletions

diff --git a/http_put.c b/http_put.c
index 9974c93..3ff7166 100644
--- a/http_put.c
+++ b/http_put.c
@@ -444,18 +444,12 @@ MOG_NOINLINE static void read_err_dbg(struct mog_fd *mfd, ssize_t r)
 {
         int save_errno = errno;
         struct mog_ni ni;
-        struct sockaddr *sa;
-        const char *addr;
         const char *path = "(unknown)";
         long long bytes = -1;
         const char *errfmt;
-        socklen_t len;
         unsigned last = last_data_recv(mfd->fd);
-        int rc;
 
-        mog_packaddr_read(&mfd->as.http.mpa, &sa, &len);
-        rc = mog_nameinfo(sa, len, &ni);
-        addr = rc == 0 ? ni.ni_host : gai_strerror(rc);
+        mog_nameinfo(&mfd->as.http.mpa, &ni);
 
         if (mfd->as.http.forward) {
                 path = mfd->as.http.forward->as.file.path;
@@ -466,11 +460,11 @@ MOG_NOINLINE static void read_err_dbg(struct mog_fd *mfd, ssize_t r)
         errfmt = (r == 0) ? PFX"premature EOF" : PFX"%m";
 #undef PFX
         errno = save_errno;
-        syslog(LOG_ERR, errfmt, path, addr, ni.ni_serv, bytes);
+        syslog(LOG_ERR, errfmt, path, ni.ni_host, ni.ni_serv, bytes);
 
         if (last != (unsigned)-1)
                 syslog(LOG_ERR, "last_data_recv=%ums from %s%s for PUT %s",
-                       last, addr, ni.ni_serv, path);
+                       last, ni.ni_host, ni.ni_serv, path);
 }
 
 static enum mog_next identity_put_in_progress(struct mog_fd *mfd)