packaddr: simplify mog_sockaddr definition

"struct sockaddr" turns out to be smaller than "struct sockaddr_in6",
so we can avoid complicated casting and just add that to the union.
We continue avoiding "struct sockaddr_storage", however, as it is
unnecessarily large for our needs.

1 files changed, 1 insertions, 10 deletions

diff --git a/packaddr.h b/packaddr.h
index fdfb9cb..de17378 100644
--- a/packaddr.h
+++ b/packaddr.h
@@ -3,22 +3,13 @@
  * License: GPLv3 or later (see COPYING for details)
  */
 
-/*
- * avoid sockaddr_storage since that bigger than we need
- * This is meant to be cast to "struct sockaddr" via mog_sockaddr_sa
- */
 union mog_sockaddr {
         struct sockaddr_in in;
         struct sockaddr_in6 in6;
+        struct sockaddr sa;
         uint8_t bytes[sizeof(struct sockaddr_in6)];
 };
 
-static inline struct sockaddr *mog_sockaddr_sa(union mog_sockaddr *msa)
-{
-        assert((void *)msa == (void *)&msa->bytes);
-        return (struct sockaddr *)msa;
-}
-
 /* this is the relevant part we may store in "struct mog_fd" */
 struct mog_packaddr {
         sa_family_t sa_family;