X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=xfer-src%2Fdest-directtcp-connect.c;h=72c59613890de9fdbed17df91ba6671019cca9ff;hb=0ab9787cd7de76aad522ee8d55ed7e87e3047458;hp=ed867249fdfe5be121b2e90e1d845a4c9db0d176;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda

diff --git a/xfer-src/dest-directtcp-connect.c b/xfer-src/dest-directtcp-connect.c
index ed86724..72c5961 100644
--- a/xfer-src/dest-directtcp-connect.c
+++ b/xfer-src/dest-directtcp-connect.c
@@ -69,7 +69,7 @@ setup_impl(
 {
     XferDestDirectTCPConnect *self = (XferDestDirectTCPConnect *)elt;
 
-    g_assert(self->addrs && self->addrs->ipv4);
+    g_assert(self->addrs && SU_GET_FAMILY(self->addrs) != 0);
     elt->input_listen_addrs = self->addrs;
 
     return TRUE;
@@ -96,8 +96,8 @@ class_init(
     XferElementClass *klass = XFER_ELEMENT_CLASS(selfc);
     GObjectClass *goc = G_OBJECT_CLASS(selfc);
     static xfer_element_mech_pair_t mech_pairs[] = {
-	{ XFER_MECH_DIRECTTCP_LISTEN, XFER_MECH_NONE, 0, 0},
-	{ XFER_MECH_NONE, XFER_MECH_NONE, 0, 0},
+	{ XFER_MECH_DIRECTTCP_LISTEN, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
+	{ XFER_MECH_NONE, XFER_MECH_NONE, XFER_NROPS(0), XFER_NTHREADS(0) },
     };
 
     klass->setup = setup_impl;
@@ -146,7 +146,7 @@ xfer_dest_directtcp_connect(
 
     g_assert(addrs != NULL);
 
-    for (i = 0; addrs[i].port; i++) ;
+    for (i = 0; SU_GET_FAMILY(&addrs[i]) != 0; i++);
     self->addrs = g_memdup(addrs, (i+1) * sizeof(*addrs));
 
     return elt;