]> git.ipfire.org Git - thirdparty/bird.git/commitdiff
RPKI: replace sock->af usage with sock->fam
authorPavel Tvrdík <pawel.tvrdik@gmail.com>
Mon, 18 Jan 2016 07:10:14 +0000 (08:10 +0100)
committerPavel Tvrdík <pawel.tvrdik@gmail.com>
Mon, 25 Jan 2016 14:39:38 +0000 (15:39 +0100)
proto/rpki/rpki.c

index a92739f0c1e58687d92d4279c82c1f6fea527271..1830ee03c35df573bdeee4c65771c411a19f71c0 100644 (file)
@@ -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;
 }