*/
#define _GNU_SOURCE
-#define AFB_BINDING_PRAGMA_NO_VERBOSE_MACRO
#include <stdio.h>
#include <string.h>
if (desc->service != NULL) {
/* not an error when onneed */
if (onneed != 0)
- return 0;
+ goto done;
/* already started: it is an error */
- ERROR("Service %s already started", desc->binding->v1.prefix);
+ ERROR("Service %s already started", desc->ditf.api);
return -1;
}
if (init == NULL && onevent == NULL) {
/* not an error when onneed */
if (onneed != 0)
- return 0;
+ goto done;
/* no initialisation method */
- ERROR("Binding %s is not a service", desc->binding->v1.prefix);
+ ERROR("Binding %s is not a service", desc->ditf.api);
return -1;
}
/* get the event handler if any */
- desc->service = afb_svc_create(desc->binding->v1.prefix, apiset, share_session, onevent, NULL);
+ desc->service = afb_svc_create(desc->ditf.api, apiset, share_session, onevent, NULL);
if (desc->service == NULL) {
- ERROR("Creation of service %s failed", desc->binding->v1.prefix);
+ ERROR("Creation of service %s failed", desc->ditf.api);
return -1;
}
/* Starts the service */
+ desc->ditf.state = Daemon_Init;
rc = afb_svc_start_v1(desc->service, init);
if (rc < 0) {
/* initialisation error */
- ERROR("Initialisation of service %s failed (%d): %m", desc->binding->v1.prefix, rc);
+ ERROR("Initialisation of service %s failed (%d): %m", desc->ditf.api, rc);
afb_svc_destroy(desc->service, NULL);
desc->service = NULL;
return rc;
}
+done:
+ desc->ditf.state = Daemon_Run;
return 0;
}
i = json_object_new_object();
json_object_object_add(r, "info", i);
- json_object_object_add(i, "title", json_object_new_string(desc->binding->v1.prefix));
+ json_object_object_add(i, "title", json_object_new_string(desc->ditf.api));
json_object_object_add(i, "version", json_object_new_string("0.0.0"));
- json_object_object_add(i, "description", json_object_new_string(desc->binding->v1.info ?: desc->binding->v1.prefix));
+ json_object_object_add(i, "description", json_object_new_string(desc->binding->v1.info ?: desc->ditf.api));
p = json_object_new_object();
json_object_object_add(r, "paths", p);
}
/* records the binding */
- afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
+ if (desc->ditf.api == path)
+ afb_ditf_rename(&desc->ditf, desc->binding->v1.prefix);
afb_api.closure = desc;
afb_api.itf = &so_v1_api_itf;
afb_api.noconcurrency = 0;
- if (afb_apiset_add(apiset, desc->binding->v1.prefix, afb_api) < 0) {
+ if (afb_apiset_add(apiset, desc->ditf.api, afb_api) < 0) {
ERROR("binding [%s] can't be registered...", path);
goto error2;
}
- INFO("binding %s loaded with API prefix %s", path, desc->binding->v1.prefix);
+ INFO("binding %s loaded with API prefix %s", path, desc->ditf.api);
return 1;
error2: