Finish @Diadlo's network Family abstraction.

The Family stuff in toxcore is a big mess. I'm sure I saw a bunch of bugs
on the way, but I'm not verifying that code now, so the bugs stay.

1 files changed, 9 insertions, 8 deletions

diff --git a/toxcore/onion.c b/toxcore/onion.c
index 476f76e9..5bbc7f75 100644
--- a/toxcore/onion.c
+++ b/toxcore/onion.c
@@ -54,9 +54,9 @@ static void change_symmetric_key(Onion *onion)
 /* packing and unpacking functions */
 static void ip_pack(uint8_t *data, IP source)
 {
-    data[0] = source.family;
+    data[0] = source.family.value;
 
-    if (source.family == TOX_AF_INET || source.family == TOX_TCP_INET) {
+    if (net_family_is_ipv4(source.family) || net_family_is_tox_tcp_ipv4(source.family)) {
         memset(data + 1, 0, SIZE_IP6);
         memcpy(data + 1, source.ip.v4.uint8, SIZE_IP4);
     } else {
@@ -71,17 +71,18 @@ static int ip_unpack(IP *target, const uint8_t *data, unsigned int data_size, bo
         return -1;
     }
 
-    target->family = data[0];
+    // TODO(iphydf): Validate input.
+    target->family.value = data[0];
 
-    if (target->family == TOX_AF_INET || target->family == TOX_TCP_INET) {
+    if (net_family_is_ipv4(target->family) || net_family_is_tox_tcp_ipv4(target->family)) {
         memcpy(target->ip.v4.uint8, data + 1, SIZE_IP4);
     } else {
         memcpy(target->ip.v6.uint8, data + 1, SIZE_IP6);
     }
 
     bool valid = disable_family_check ||
-                 target->family == TOX_AF_INET ||
-                 target->family == TOX_AF_INET6;
+                 net_family_is_ipv4(target->family) ||
+                 net_family_is_ipv6(target->family);
 
     return valid ? 0 : -1;
 }
@@ -642,8 +643,8 @@ static int handle_recv_1(void *object, IP_Port source, const uint8_t *packet, ui
     uint16_t data_len = length - (1 + RETURN_1);
 
     if (onion->recv_1_function &&
-            send_to.ip.family != TOX_AF_INET &&
-            send_to.ip.family != TOX_AF_INET6) {
+            !net_family_is_ipv4(send_to.ip.family) &&
+            !net_family_is_ipv6(send_to.ip.family)) {
         return onion->recv_1_function(onion->callback_object, send_to, packet + (1 + RETURN_1), data_len);
     }