client: remove authenticate from server

Change-Id: I50b6429f54b84811bb2ed2c6a09d3da93d601d92

diff --git a/src/wayland-tbm-client.c b/src/wayland-tbm-client.c
index ae716f3..9ee7ce1 100755 (executable)
--- a/src/wayland-tbm-client.c
+++ b/src/wayland-tbm-client.c
@@ -42,23 +42,12 @@ DEALINGS IN THE SOFTWARE.
 #include "wayland-tbm-int.h"
 
 
-//#define WL_TBM_CLIENT_DEBUG
-
 struct wayland_tbm_client {
        struct wl_display *dpy;
        struct wl_event_queue *wl_queue;
        struct wl_tbm *wl_tbm;
 
        tbm_bufmgr bufmgr;
-       int32_t auth_fd;
-       uint32_t capabilities;
-       char *device;
-
-       /* This authenticated information is for the client of the embedded server.
-        */
-       int32_t embedded_auth_fd;
-       uint32_t embedded_capabilities;
-       char *embedded_device;
 };
 
 static void
@@ -71,11 +60,6 @@ handle_tbm_monitor_client_tbm_bo(void *data,
 {
        struct wayland_tbm_client *tbm_client = (struct wayland_tbm_client *)data;
 
-#ifdef WL_TBM_CLIENT_DEBUG
-       WL_TBM_LOG("[%s]: command=%d, trace_command=%d, pid=%d\n", __func__, command,
-                  trace_command, pid);
-#endif
-
        if (command == WL_TBM_MONITOR_COMMAND_SHOW) {
                if (target == WL_TBM_MONITOR_TARGET_CLIENT) {
                        if (getpid() == pid)
@@ -102,31 +86,6 @@ handle_tbm_authentication_info(void *data,
                               uint32_t capabilities,
                               int32_t auth_fd)
 {
-       struct wayland_tbm_client *tbm_client = (struct wayland_tbm_client *)data;
-
-       if (tbm_client->auth_fd == -1 ) {
-#ifdef WL_TBM_CLIENT_DEBUG
-               WL_TBM_LOG("[%s]: get the client auth info\n", __func__);
-#endif
-               /* client authentication infomation */
-               tbm_client->auth_fd = auth_fd;
-               tbm_client->capabilities = capabilities;
-               if (device_name)
-                       tbm_client->device = strndup(device_name, 256);
-       } else {
-#ifdef WL_TBM_CLIENT_DEBUG
-               WL_TBM_LOG("[%s]: get the embedded server client auth info\n", __func__);
-#endif
-               /* authentication information of embedded server client */
-               tbm_client->embedded_auth_fd = auth_fd;
-               tbm_client->embedded_capabilities = capabilities;
-               tbm_client->embedded_device = strndup(device_name, 256);
-       }
-
-#ifdef WL_TBM_CLIENT_DEBUG
-       WL_TBM_LOG("[%s]: tbm_client=%p, wl_tbm=%p, device_name=%s, capabilities=%d, auth_fd=%d\n",
-                  __func__, tbm_client, wl_tbm, device_name, capabilities, auth_fd);
-#endif
 }
 
 static const struct wl_tbm_listener wl_tbm_client_listener = {
@@ -149,22 +108,7 @@ _wayland_tbm_client_registry_handle_global(void *data,
                wl_tbm_add_listener(tbm_client->wl_tbm, &wl_tbm_client_listener, tbm_client);
                wl_proxy_set_queue((struct wl_proxy *)tbm_client->wl_tbm, tbm_client->wl_queue);
 
-               /* get the authentication from the display server */
-               wl_tbm_get_authentication_info(tbm_client->wl_tbm);
-               wl_display_roundtrip_queue(tbm_client->dpy, tbm_client->wl_queue);
-
-               // TODO: check the failure to get the auth information.
-               //   WL_TBM_LOG("failed to get auth_info\n");
-               //   tbm_client->wl_tbm = NULL;
-               //   return;
-
-#ifdef WL_TBM_CLIENT_DEBUG
-               WL_TBM_LOG("[%s]: tbm_client=%p, wl_tbm=%p, device_name=%s, capabilities=%d, auth_fd=%d\n",
-                          __func__, tbm_client, tbm_client->wl_tbm, tbm_client->device,
-                          tbm_client->capabilities, tbm_client->auth_fd);
-#endif
-
-               tbm_client->bufmgr = tbm_bufmgr_init(tbm_client->auth_fd);
+               tbm_client->bufmgr = tbm_bufmgr_init(-1);
                if (!tbm_client->bufmgr) {
                        WL_TBM_LOG("failed to get auth_info\n");
 
@@ -191,8 +135,6 @@ wayland_tbm_client_init(struct wl_display *display)
        WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
 
        tbm_client->dpy = display;
-       tbm_client->auth_fd = -1; /* initialize */
-       tbm_client->embedded_auth_fd = -1; /* for embedded server client */
 
        tbm_client->wl_queue = wl_display_create_queue(display);
        if (!tbm_client->wl_queue) {
@@ -213,10 +155,6 @@ wayland_tbm_client_init(struct wl_display *display)
 
        wl_proxy_set_queue((struct wl_proxy *)wl_registry, tbm_client->wl_queue);
 
-#ifdef WL_TBM_CLIENT_DEBUG
-       WL_TBM_LOG("[%s]: tbm_client=%p, display=%p\n", __func__, tbm_client, display);
-#endif
-
        wl_registry_add_listener(wl_registry, &registry_listener, tbm_client);
        wl_display_roundtrip_queue(display, tbm_client->wl_queue);
 
@@ -244,9 +182,6 @@ wayland_tbm_client_deinit(struct wayland_tbm_client *tbm_client)
        if (!tbm_client)
                return;
 
-       /* clear the embedded server client auth information */
-       _wayland_tbm_client_reset_embedded_auth_info(tbm_client);
-
        if (tbm_client->wl_tbm) {
                wl_tbm_set_user_data(tbm_client->wl_tbm, NULL);
                wl_tbm_destroy(tbm_client->wl_tbm);
@@ -255,12 +190,6 @@ wayland_tbm_client_deinit(struct wayland_tbm_client *tbm_client)
        if (tbm_client->bufmgr)
                tbm_bufmgr_deinit(tbm_client->bufmgr);
 
-       if (tbm_client->device)
-               free(tbm_client->device);
-
-       if (tbm_client->auth_fd)
-               close(tbm_client->auth_fd);
-
        free(tbm_client);
 }
 
@@ -383,23 +312,6 @@ wayland_tbm_client_destroy_buffer(struct wayland_tbm_client *tbm_client,
        wl_buffer_destroy(buffer);
 }
 
-
-const char *
-wayland_tbm_client_get_device_name(struct wayland_tbm_client *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
-
-       return (const char *)tbm_client->device;
-}
-
-uint32_t
-wayland_tbm_client_get_capability(struct wayland_tbm_client *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, 0);
-
-       return tbm_client->capabilities;
-}
-
 void *
 wayland_tbm_client_get_bufmgr(struct wayland_tbm_client *tbm_client)
 {
@@ -408,14 +320,6 @@ wayland_tbm_client_get_bufmgr(struct wayland_tbm_client *tbm_client)
        return (void *)tbm_client->bufmgr;
 }
 
-int32_t
-_wayland_tbm_client_get_auth_fd(struct wayland_tbm_client *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, -1);
-
-       return tbm_client->auth_fd;
-}
-
 struct wl_tbm *
 _wayland_tbm_client_get_wl_tbm(struct wayland_tbm_client *tbm_client)
 {
@@ -424,49 +328,3 @@ _wayland_tbm_client_get_wl_tbm(struct wayland_tbm_client *tbm_client)
        return tbm_client->wl_tbm;
 }
 
-void
-_wayland_tbm_client_reset_embedded_auth_info(struct wayland_tbm_client
-               *tbm_client)
-{
-       WL_TBM_RETURN_IF_FAIL(tbm_client != NULL);
-
-       if (tbm_client->embedded_auth_fd > 0) {
-               close(tbm_client->embedded_auth_fd);
-               tbm_client->embedded_auth_fd = -1;
-       }
-
-       tbm_client->embedded_capabilities = 0;
-
-       if (tbm_client->embedded_device != NULL) {
-               free(tbm_client->embedded_device);
-               tbm_client->embedded_device = NULL;
-       }
-}
-
-int32_t
-_wayland_tbm_client_get_embedded_auth_fd(struct wayland_tbm_client *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, -1);
-
-       return tbm_client->embedded_auth_fd;
-}
-
-uint32_t
-_wayland_tbm_client_get_embedded_capability(struct wayland_tbm_client
-               *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, 0);
-
-       return tbm_client->embedded_capabilities;
-}
-
-const char *
-_wayland_tbm_client_get_embedded_device_name(struct wayland_tbm_client
-               *tbm_client)
-{
-       WL_TBM_RETURN_VAL_IF_FAIL(tbm_client != NULL, NULL);
-
-       return (const char *)tbm_client->embedded_device;
-}
-
-

diff --git a/src/wayland-tbm-client.h b/src/wayland-tbm-client.h
index 26054ab..2da021d 100644 (file)
--- a/src/wayland-tbm-client.h
+++ b/src/wayland-tbm-client.h
@@ -39,21 +39,21 @@ extern "C" {
 
 struct wayland_tbm_client;
 
-struct wayland_tbm_client *wayland_tbm_client_init(struct wl_display *display);
-void                       wayland_tbm_client_deinit(struct wayland_tbm_client
-               *tbm_client);
-
-struct wl_buffer *wayland_tbm_client_create_buffer(struct wayland_tbm_client
-               *tbm_client, tbm_surface_h surface);
-void              wayland_tbm_client_destroy_buffer(struct wayland_tbm_client
-               *tbm_client, struct wl_buffer *buffer);
-
-const char     *wayland_tbm_client_get_device_name(struct wayland_tbm_client
-               *tbm_client);
-uint32_t        wayland_tbm_client_get_capability(struct wayland_tbm_client
-               *tbm_client);
-void           *wayland_tbm_client_get_bufmgr(struct wayland_tbm_client
-               *tbm_client);
+struct wayland_tbm_client *
+wayland_tbm_client_init(struct wl_display *display);
+
+void
+wayland_tbm_client_deinit(struct wayland_tbm_client *tbm_client);
+
+struct wl_buffer *
+wayland_tbm_client_create_buffer(struct wayland_tbm_client *tbm_client,
+                                tbm_surface_h surface);
+
+void
+wayland_tbm_client_destroy_buffer(struct wayland_tbm_client *tbm_client,
+                                 struct wl_buffer *buffer);
+
+void *wayland_tbm_client_get_bufmgr(struct wayland_tbm_client *tbm_client);
 
 #ifdef  __cplusplus
 }

diff --git a/src/wayland-tbm-int.h b/src/wayland-tbm-int.h
index 452f8e2..44284c3 100644 (file)
--- a/src/wayland-tbm-int.h
+++ b/src/wayland-tbm-int.h
@@ -84,22 +84,14 @@ typedef enum {
 } WL_TBM_MONITOR_TARGET;
 
 /* internal functions */
-int32_t        _wayland_tbm_client_get_auth_fd(struct wayland_tbm_client
-               *tbm_client);
-struct wl_tbm *_wayland_tbm_client_get_wl_tbm(struct wayland_tbm_client
-               *tbm_client);
-
-void         _wayland_tbm_client_reset_embedded_auth_info(
-       struct wayland_tbm_client *tbm_client);
-int32_t      _wayland_tbm_client_get_embedded_auth_fd(struct wayland_tbm_client
-               *tbm_client);
-uint32_t     _wayland_tbm_client_get_embedded_capability(
-       struct wayland_tbm_client *tbm_client);
-const char  *_wayland_tbm_client_get_embedded_device_name(
-       struct wayland_tbm_client *tbm_client);
-
-void    _wayland_tbm_util_get_appname_brief(char *brief);
-void    _wayland_tbm_util_get_appname_from_pid(long pid, char *str);
+struct wl_tbm *
+_wayland_tbm_client_get_wl_tbm(struct wayland_tbm_client *tbm_client);
+
+void
+_wayland_tbm_util_get_appname_brief(char *brief);
+
+void
+_wayland_tbm_util_get_appname_from_pid(long pid, char *str);
 
 #ifdef  __cplusplus
 }

diff --git a/src/wayland-tbm-server.c b/src/wayland-tbm-server.c
index 838a8ef..141cafc 100755 (executable)
--- a/src/wayland-tbm-server.c
+++ b/src/wayland-tbm-server.c
@@ -176,7 +176,7 @@ _send_server_auth_info(struct wayland_tbm_server *tbm_srv,
 
        if (!tbm_srv->device_name) {
                wl_resource_post_error(resource, WL_TBM_ERROR_AUTHENTICATE_FAIL,
-                       "device_name is NULL");
+                                      "device_name is NULL");
                goto fini;
        }