Merge pull request #97 from eboasson/fix-90

Fix take with query condition and the curious case of a netmask without an address family

src/core/ddsc/src/dds_rhc.c

@@ -1874,6 +1874,7 @@ static int dds_rhc_take_w_qminv
                 {
                   /* The filter didn't match, so free the deserialised copy. */
                   ddsi_sertopic_free_sample (rhc->topic, values[n], DDS_FREE_CONTENTS);
+                  psample = sample;
                 }
               }
               sample = sample1;

src/core/ddsc/tests/querycondition.c

@@ -75,7 +75,7 @@ create_topic_name(const char *prefix, char *name, size_t size)
 }
 
 static void
-querycondition_init(void)
+querycondition_init_hdepth(int hdepth)
 {
     Space_Type1 sample = { 0, 0, 0 };
     dds_qos_t *qos = dds_create_qos ();
@@ -93,7 +93,7 @@ querycondition_init(void)
     CU_ASSERT_FATAL(g_topic > 0);
 
     /* Create a reader that keeps last sample of all instances. */
-    dds_qset_history(qos, DDS_HISTORY_KEEP_LAST, 1);
+    dds_qset_history(qos, DDS_HISTORY_KEEP_LAST, hdepth);
     g_reader = dds_create_reader(g_participant, g_topic, qos, NULL);
     CU_ASSERT_FATAL(g_reader > 0);
 
@@ -182,6 +182,18 @@ querycondition_init(void)
     dds_delete_qos(qos);
 }
 
+static void
+querycondition_init(void)
+{
+    querycondition_init_hdepth(1);
+}
+
+static void
+querycondition_init_deephist(void)
+{
+    querycondition_init_hdepth(333);
+}
+
 static void
 querycondition_fini(void)
 {
@@ -1474,3 +1486,75 @@ CU_Test(ddsc_querycondition_take, already_deleted, .init=querycondition_init, .f
     CU_ASSERT_EQUAL(dds_err_nr(ret), DDS_RETCODE_ALREADY_DELETED);
 }
 /*************************************************************************************************/
+
+/*************************************************************************************************/
+static bool
+filter_k333_s1(const void * sample)
+{
+    const Space_Type1 *s = sample;
+    return (s->long_1 == 333 && s->long_2 == 1);
+}
+
+CU_Test(ddsc_querycondition_take, some_from_instance, .init=querycondition_init_deephist, .fini=querycondition_fini)
+{
+    static const int sched[] = { 1, 0, 1, 0, 1, 1, 0, 1, 1, 1 };
+    static const int nsched = (int) (sizeof (sched) / sizeof (sched[0]));
+    dds_entity_t condition;
+    dds_return_t ret;
+    int idx, run;
+
+    condition = dds_create_querycondition (g_reader, DDS_ANY_SAMPLE_STATE | DDS_ANY_VIEW_STATE | DDS_ANY_INSTANCE_STATE, filter_k333_s1);
+    CU_ASSERT_FATAL (condition > 0);
+
+    for (int i = 0; i < nsched; i++) {
+        const Space_Type1 sample = { 333, sched[i], i };
+        ret = dds_write (g_writer, &sample);
+        CU_ASSERT_EQUAL_FATAL (ret, DDS_RETCODE_OK);
+    }
+
+    /* Try taking consecutive runs of ones, so that we take first, intermediate and final ones */
+    idx = 0;
+    while (idx < nsched) {
+        CU_ASSERT_FATAL (sched[idx] == 1);
+        run = 1;
+        while (idx + run < nsched && sched[idx + run] == 1) {
+            run++;
+        }
+        ret = dds_take (condition, g_samples, g_info, (size_t)run, (uint32_t)run);
+        CU_ASSERT_EQUAL (ret, run);
+        for (int i = 0; i < ret; i++) {
+            CU_ASSERT_EQUAL (g_data[i].long_1, 333);
+            CU_ASSERT_EQUAL (g_data[i].long_2, 1);
+            CU_ASSERT_EQUAL (g_data[i].long_3, idx + i);
+        }
+        idx += run;
+        while (idx < nsched && sched[idx] != 1) {
+            idx++;
+        }
+    }
+
+    /* Take all remaining samples from the instance */
+    for (idx = 0, run = 0; idx < nsched; idx++) {
+        run += (sched[idx] != 1);
+    }
+    CU_ASSERT_FATAL (run > 0);
+    ret = dds_take_instance (g_reader, g_samples, g_info, MAX_SAMPLES, MAX_SAMPLES, g_info[0].instance_handle);
+    CU_ASSERT_EQUAL (ret, run);
+    idx = 0;
+    while (sched[idx] != 0) {
+        idx++;
+    }
+    for (int i = 0; i < ret; i++) {
+        CU_ASSERT_EQUAL (g_data[i].long_1, 333);
+        CU_ASSERT_NOT_EQUAL (g_data[i].long_2, 1);
+        CU_ASSERT_EQUAL (g_data[i].long_3, idx);
+        idx++;
+        while (idx < nsched && sched[idx] == 1) {
+            idx++;
+        }
+    }
+
+    ret = dds_delete(condition);
+    CU_ASSERT_EQUAL_FATAL (ret, DDS_RETCODE_OK);
+}
+/*************************************************************************************************/

src/os/src/posix/os_platform_ifaddrs.c

@@ -43,6 +43,11 @@ copyaddr(os_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
         {
             err = errno;
         }
+        /* Seen on macOS using OpenVPN: netmask without an address family,
+           in which case copy it from the interface address */
+        if (ifa->addr && ifa->netmask && ifa->netmask->sa_family == 0) {
+            ifa->netmask->sa_family = ifa->addr->sa_family;
+        }
     }
 
     if (err == 0) {