X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafb-api-ws.c;h=7fbe5be18b0a59a0d87cf84f3883c1e8dd150be7;hb=f15ea770dd9b13a20331853a026091316984f9ca;hp=1a46358764166a9d2dabde8a5f6ceb761a576d7a;hpb=adb89e71f1c366b0cabdf9e04aaed60b84a96f0e;p=src%2Fapp-framework-binder.git

diff --git a/src/afb-api-ws.c b/src/afb-api-ws.c
index 1a463587..7fbe5be1 100644
--- a/src/afb-api-ws.c
+++ b/src/afb-api-ws.c
@@ -33,10 +33,9 @@
 #include <systemd/sd-event.h>
 #include "afb-api.h"
 #include "afb-apiset.h"
-#include "afb-common.h"
+#include "afb-systemd.h"
 #include "afb-stub-ws.h"
 #include "verbose.h"
-#include "sd-fds.h"
 
 struct api_ws
 {
@@ -73,7 +72,7 @@ static struct api_ws *api_ws_make(const char *path)
 	while (length && path[length - 1] != '/' && path[length - 1] != ':')
 		length = length - 1;
 	api->api = &api->path[length];
-	if (api->api == NULL || !afb_api_is_valid_name(api->api)) {
+	if (api->api == NULL || !afb_api_is_valid_name(api->api, 1)) {
 		errno = EINVAL;
 		goto error2;
 	}
@@ -177,7 +176,7 @@ static int api_ws_socket(const char *path, int server)
 
 	/* check for systemd socket */
 	if (0 == strncmp(path, "sd:", 3))
-		fd = sd_fds_for(path + 3);
+		fd = systemd_fds_for(path + 3);
 	else {
 		/* check for unix socket */
 		if (0 == strncmp(path, "unix:", 5))
@@ -310,7 +309,7 @@ static int api_ws_server_connect(struct api_ws *apiws)
 		ERROR("can't create socket %s", apiws->path);
 	else {
 		/* listen for service */
-		rc = sd_event_add_io(afb_common_get_event_loop(),
+		rc = sd_event_add_io(afb_systemd_get_event_loop(),
 				&apiws->listensrc, apiws->fd, EPOLLIN,
 				api_ws_server_listen_callback, apiws);
 		if (rc >= 0)