gfdgd_xi
/
libgbinder
mirror of https://github.com/waydroid/libgbinder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[gbinder] Added gbinder_bridge_new2(). JB#52557 

Allows to use different source and destination names.
This commit is contained in:
Slava Monich 2021-02-17 13:40:23 +02:00
parent 82f71a6c91
commit 1d9f9c4487
4 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/gbinder_bridge.h
View File

@ -37,12 +37,6 @@
/* Since 1.1.5 */
/*
* As of time of this writing, bridging only works for binder transactions
* which only involve passing serialized data back and forth. It doesn't
* work with transactions which pass references to remote objects.
*/
G_BEGIN_DECLS
/*
@ -69,6 +63,15 @@ gbinder_bridge_new(
GBinderServiceManager* dest) /* Since 1.1.5 */
G_GNUC_WARN_UNUSED_RESULT;
GBinderBridge*
gbinder_bridge_new2(
const char* src_name,
const char* dest_name,
const char* const* ifaces,
GBinderServiceManager* src,
GBinderServiceManager* dest) /* Since 1.1.6 */
G_GNUC_WARN_UNUSED_RESULT;
void
gbinder_bridge_free(
GBinderBridge* bridge); /* Since 1.1.5 */

52
src/gbinder_bridge.c
View File

@ -52,11 +52,12 @@ typedef struct gbinder_bridge_interface {
GBinderBridge* bridge;
char* iface;
char* fqname;
char* name;
char* src_name;
char* dest_name;
gulong dest_watch_id;
gulong dest_death_id;
GBinderRemoteObject* dest_obj;
GBinderServiceName* src_name;
GBinderServiceName* src_service;
GBinderProxyObject* proxy;
} GBinderBridgeInterface;
@ -94,9 +95,9 @@ gbinder_bridge_interface_deactivate(
gbinder_local_object_drop(GBINDER_LOCAL_OBJECT(bi->proxy));
bi->proxy = NULL;
}
if (bi->src_name) {
gbinder_servicename_unref(bi->src_name);
bi->src_name = NULL;
if (bi->src_service) {
gbinder_servicename_unref(bi->src_service);
bi->src_service = NULL;
}
}
@ -111,7 +112,8 @@ gbinder_bridge_interface_free(
gbinder_servicemanager_remove_handler(bridge->dest, bi->dest_watch_id);
g_free(bi->iface);
g_free(bi->fqname);
g_free(bi->name);
g_free(bi->src_name);
g_free(bi->dest_name);
gutil_slice_free(bi);
}
@ -136,7 +138,7 @@ gbinder_bridge_interface_activate(
GBinderServiceManager* src = bridge->src;
GBinderServiceManager* dest = bridge->dest;
if (bi->dest_obj && gbinder_remote_object_is_dead(bi->dest_obj)) {
if (bi->dest_obj && bi->dest_obj->dead) {
gbinder_bridge_dest_drop_remote_object(bi);
}
if (!bi->dest_obj) {
@ -153,9 +155,9 @@ gbinder_bridge_interface_activate(
bi->proxy = gbinder_proxy_object_new(gbinder_servicemanager_ipc(src),
bi->dest_obj);
}
if (bi->proxy && !bi->src_name) {
bi->src_name = gbinder_servicename_new(src,
GBINDER_LOCAL_OBJECT(bi->proxy), bi->name);
if (bi->proxy && !bi->src_service) {
bi->src_service = gbinder_servicename_new(src,
GBINDER_LOCAL_OBJECT(bi->proxy), bi->src_name);
}
}
@ -178,15 +180,17 @@ static
GBinderBridgeInterface*
gbinder_bridge_interface_new(
GBinderBridge* self,
const char* name,
const char* src_name,
const char* dest_name,
const char* iface)
{
GBinderBridgeInterface* bi = g_slice_new0(GBinderBridgeInterface);
bi->bridge = self;
bi->iface = g_strdup(iface);
bi->fqname = g_strconcat(iface, "/", name, NULL);
bi->name = g_strdup(name);
bi->fqname = g_strconcat(iface, "/", dest_name, NULL);
bi->src_name = g_strdup(src_name);
bi->dest_name = g_strdup(dest_name);
bi->dest_watch_id = gbinder_servicemanager_add_registration_handler
(self->dest, bi->fqname, gbinder_bridge_dest_registration_proc, bi);
@ -204,11 +208,27 @@ gbinder_bridge_new(
const char* name,
const char* const* ifaces,
GBinderServiceManager* src,
GBinderServiceManager* dest)
GBinderServiceManager* dest) /* Since 1.1.5 */
{
return gbinder_bridge_new2(name, NULL, ifaces, src, dest);
}
GBinderBridge*
gbinder_bridge_new2(
const char* src_name,
const char* dest_name,
const char* const* ifaces,
GBinderServiceManager* src,
GBinderServiceManager* dest) /* Since 1.1.6 */
{
const guint n = gutil_strv_length((const GStrV*)ifaces);
if (G_LIKELY(name) && G_LIKELY(n) && G_LIKELY(src) && G_LIKELY(dest)) {
if (!src_name) {
src_name = dest_name;
} else if (!dest_name) {
dest_name = src_name;
}
if (G_LIKELY(src_name) && G_LIKELY(n) && G_LIKELY(src) && G_LIKELY(dest)) {
GBinderBridge* self = g_slice_new0(GBinderBridge);
guint i;
@ -217,7 +237,7 @@ gbinder_bridge_new(
self->ifaces = g_new(GBinderBridgeInterface*, n + 1);
for (i = 0; i < n; i++) {
self->ifaces[i] = gbinder_bridge_interface_new(self,
name, ifaces[i]);
src_name, dest_name, ifaces[i]);
}
self->ifaces[i] = NULL;
return self;

12
test/binder-bridge/binder-bridge.c
View File

@ -43,7 +43,8 @@
typedef struct app_options {
const char* src;
const char* dest;
const char* name;
char* src_name;
const char* dest_name;
const char** ifaces;
} AppOptions;
@ -72,8 +73,8 @@ app_run(
GMainLoop* loop = g_main_loop_new(NULL, TRUE);
guint sigtrm = g_unix_signal_add(SIGTERM, app_signal, loop);
guint sigint = g_unix_signal_add(SIGINT, app_signal, loop);
GBinderBridge* bridge = gbinder_bridge_new
(opt->name, opt->ifaces, src, dest);
GBinderBridge* bridge = gbinder_bridge_new2
(opt->src_name, opt->dest_name, opt->ifaces, src, dest);
g_main_loop_run(loop);
@ -126,6 +127,8 @@ app_init(
{
gboolean ok = FALSE;
GOptionEntry entries[] = {
{ "source", 's', 0, G_OPTION_ARG_STRING, &opt->src_name,
"Register a different name on source", "NAME" },
{ "verbose", 'v', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
app_log_verbose, "Enable verbose output", NULL },
{ "quiet", 'q', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
@ -149,7 +152,7 @@ app_init(
opt->src = argv[1];
opt->dest = argv[2];
opt->name = argv[3];
opt->dest_name = argv[3];
opt->ifaces = g_new(const char*, argc - first_iface + 1);
for (i = first_iface; i < argc; i++) {
opt->ifaces[i - first_iface] = argv[i];
@ -179,6 +182,7 @@ int main(int argc, char* argv[])
if (app_init(&opt, argc, argv)) {
ret = app_run(&opt);
}
g_free(opt.src_name);
g_free(opt.ifaces);
return ret;
}

3
unit/unit_bridge/unit_bridge.c
View File

@ -205,6 +205,7 @@ test_null(
{
static const char* ifaces[] = { "foo", "bar", NULL};
g_assert(!gbinder_bridge_new2(NULL, NULL, NULL, NULL, NULL));
g_assert(!gbinder_bridge_new(NULL, NULL, NULL, NULL));
g_assert(!gbinder_bridge_new("foo", NULL, NULL, NULL));
g_assert(!gbinder_bridge_new("foo", ifaces, NULL, NULL));
@ -377,7 +378,7 @@ test_basic_run(
/* Both src and dest are required */
g_assert(!gbinder_bridge_new(name, TEST_IFACES, src, NULL));
bridge = gbinder_bridge_new(name, TEST_IFACES, src, dest);
bridge = gbinder_bridge_new2(NULL, name, TEST_IFACES, src, dest);
/* Start watching the name */
id = gbinder_servicemanager_add_registration_handler(src, fqname,