From: Pavel Tvrdík <pawel.tvrdik@gmail.com>
Date: Mon, 18 Jan 2016 07:10:14 +0000 (+0100)
Subject: RPKI: replace sock->af usage with sock->fam
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c727c284040b6d14ac9f161aa6a9cfd58d6cb9eb;p=thirdparty%2Fbird.git

RPKI: replace sock->af usage with sock->fam
---

diff --git a/proto/rpki/rpki.c b/proto/rpki/rpki.c
index a92739f0c..1830ee03c 100644
--- a/proto/rpki/rpki.c
+++ b/proto/rpki/rpki.c
@@ -223,7 +223,10 @@ rpki_sock_dst_autoresolv(sock *sk)
       return TR_ERROR;
     }
 
-    sk->af = res->ai_family;
+    if (res->ai_family == AF_INET)
+      sk->fam = SK_FAM_IPV4;
+    else
+      sk->fam = SK_FAM_IPV6; /* optimistic */
 
     sockaddr sa = {
         .sa = *res->ai_addr,
@@ -237,7 +240,7 @@ rpki_sock_dst_autoresolv(sock *sk)
   else if (ipa_zero(sk->daddr) && !sk->host)
     return TR_ERROR;
   else
-    sk->af = ip6_is_v4mapped(sk->daddr) ? AF_INET : AF_INET6;
+    sk->fam = ip6_is_v4mapped(sk->daddr) ? SK_FAM_IPV4 : SK_FAM_IPV6; /* optimistic */
 
   return TR_SUCCESS;
 }