Merge branch '52-support-multiple-cdo-handles-from-the-same-application' into 'devel'

Resolve "Support multiple CDO handles from the same application"

Closes #52

See merge request !20

maestro/drc.c

@@ -233,7 +233,7 @@ mstro_drc_insert_ofi(struct fi_info *fi, const mstro_drc_info info)
   
 #if FI_VERSION_GE(FI_VERSION(FI_MAJOR_VERSION,FI_MINOR_VERSION), FI_VERSION(1,5))
   // auth key is free()ed by fabric.c on teardown, so we need to duplicate it
-  fi->domain_attr->auth_key = dup_authkey(&info->auth_key);
+  fi->domain_attr->auth_key = (uint8_t*) dup_authkey(&info->auth_key);
   if(fi->domain_attr->auth_key==NULL) {
     return MSTRO_NOMEM;
   }

maestro/pool.c

@@ -1135,7 +1135,7 @@ mstro_pool__find_source_cdo(
   }
   if(i<e->num_cdo_handles) {
     DEBUG("Found CDO at index %zu that can provide data\n", i);
-    if(mstro_cdo_state_get(e->cdo_handles[i])==MSTRO_CDO_STATE_SEALED) {
+    if(mstro_cdo_state_get(e->cdo_handles[i])==MSTRO_CDO_STATE_OFFERED_LOCALLY) {
       WITH_CDO_ID_STR(idstr, cdoid, {
           DEBUG("Doing implicit OFFER-ACK for CDO %s at transport ticket creation (src side) time\n",
                 idstr);

tests/Makefile.am

@@ -50,7 +50,7 @@ AM_CPPFLAGS = $(TEST_INCLUDES) -DTOPSRCDIR=$(top_srcdir)
 
 LDADD = $(top_builddir)/libmaestro.la
 
-check_HEADERS = cheat.h
+check_HEADERS = cheat.h ecmwf_config.h
 
 TESTS = check_version check_init check_uuid \
 	coverage check_memlock \