|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,6 +2,6 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/libgbinder.git</param>
<param name="branch">master</param>
- <param name="revision">1.1.18</param>
+ <param name="revision">1.1.30</param>
</service>
</services>
\ No newline at end of file
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/AUTHORS
^
|
| @@ -7,3 +7,5 @@
George Hopkins <george-hopkins@null.net>
Bart Ribbers <bribbers@disroot.org>
Gary Wang <gary.wang@canonical.com>
+Eugenio Paolantonio <me@medesimo.eu>
+Alessandro Astone <ales.astone@gmail.com>
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/Makefile
^
|
| @@ -16,7 +16,7 @@
VERSION_MAJOR = 1
VERSION_MINOR = 1
-VERSION_RELEASE = 18
+VERSION_RELEASE = 30
# Version for pkg-config
PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)
@@ -105,6 +105,7 @@
gbinder_servicemanager_aidl.c \
gbinder_servicemanager_aidl2.c \
gbinder_servicemanager_aidl3.c \
+ gbinder_servicemanager_aidl4.c \
gbinder_servicemanager_hidl.c
SRC += \
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/debian/changelog
^
|
| @@ -1,3 +1,78 @@
+libgbinder (1.1.30) unstable; urgency=low
+
+ * Fixed BC_ACQUIRE_DONE encoding
+
+ -- Slava Monich <slava.monich@jolla.com> Sun, 04 Dec 2022 19:50:10 +0200
+
+libgbinder (1.1.29) unstable; urgency=low
+
+ * Added gbinder_writer_append_struct_vec
+
+ -- Slava Monich <slava.monich@jolla.com> Fri, 25 Nov 2022 00:01:41 +0200
+
+libgbinder (1.1.28) unstable; urgency=low
+
+ * Allow to pass negative number as a parameter to binder-call
+ * Compile tools as PIE
+
+ -- Slava Monich <slava.monich@jolla.com> Tue, 22 Nov 2022 18:21:29 +0200
+
+libgbinder (1.1.27) unstable; urgency=low
+
+ * Added gbinder_writer_append_struct()
+
+ -- Slava Monich <slava.monich@jolla.com> Thu, 17 Nov 2022 03:25:37 +0200
+
+libgbinder (1.1.26) unstable; urgency=low
+
+ * Use BINDER_TYPE_HANDLE for NULL binders
+ * Fixed binder object encoding in aidl3 protocol
+
+ -- Slava Monich <slava.monich@jolla.com> Fri, 14 Oct 2022 16:48:29 +0300
+
+libgbinder (1.1.25) unstable; urgency=low
+
+ * Handle RPC protocol change at run time
+
+ -- Slava Monich <slava.monich@jolla.com> Tue, 19 Jul 2022 02:02:41 +0300
+
+libgbinder (1.1.24) unstable; urgency=low
+
+ * Bumped debhelper compat level to 7
+
+ -- Slava Monich <slava.monich@jolla.com> Thu, 14 Jul 2022 01:32:11 +0300
+
+libgbinder (1.1.23) unstable; urgency=low
+
+ * Fixed Debian build dependencies
+
+ -- Slava Monich <slava.monich@jolla.com> Thu, 23 Jun 2022 20:09:35 +0300
+
+libgbinder (1.1.22) unstable; urgency=low
+
+ * Added support for Android 12 (API level 31)
+ * Made binder device configurable for binder-dump
+
+ -- Slava Monich <slava.monich@jolla.com> Wed, 22 Jun 2022 17:02:20 +0300
+
+libgbinder (1.1.21) unstable; urgency=low
+
+ * Properly finalize GBinderIpc and GBinderServicePoll
+
+ -- Slava Monich <slava.monich@jolla.com> Mon, 20 Jun 2022 18:53:26 +0300
+
+libgbinder (1.1.20) unstable; urgency=low
+
+ * Made RPC protocol selectable at runtime
+
+ -- Slava Monich <slava.monich@jolla.com> Sat, 11 Jun 2022 02:49:49 +0300
+
+libgbinder (1.1.19) unstable; urgency=low
+
+ * Added reader and writer for aidl parcelables
+
+ -- Slava Monich <slava.monich@jolla.com> Sun, 20 Feb 2022 03:26:24 +0200
+
libgbinder (1.1.18) unstable; urgency=low
* Disassociate auto-created proxies to stop them from piling up
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/debian/compat
^
|
| @@ -1 +1 @@
-5
+7
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/debian/control
^
|
| @@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Slava Monich <slava.monich@jolla.com>
-Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil (>= 1.0.52), flex, bison
+Build-Depends: debhelper (>= 8.1.3), libglib2.0-dev (>= 2.0), libglibutil-dev (>= 1.0.52), flex, bison
Standards-Version: 3.8.4
Package: libgbinder
@@ -14,7 +14,7 @@
Package: libgbinder-dev
Section: libdevel
Architecture: any
-Depends: libgbinder (= ${binary:Version}), ${misc:Depends}
+Depends: libgbinder (= ${binary:Version}), libglibutil-dev (>= 1.0.52)
Description: Development files for libgbinder
Package: libgbinder-tools
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/include/gbinder_reader.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -143,6 +143,11 @@
G_GNUC_WARN_UNUSED_RESULT;
const void*
+gbinder_reader_read_parcelable(
+ GBinderReader* reader,
+ gsize* size); /* Since 1.1.19 */
+
+const void*
gbinder_reader_read_hidl_struct1(
GBinderReader* reader,
gsize size); /* Since 1.0.9 */
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/include/gbinder_servicemanager.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -76,7 +76,15 @@
GBinderServiceManager*
gbinder_servicemanager_new(
- const char* dev);
+ const char* dev)
+ G_GNUC_WARN_UNUSED_RESULT;
+
+GBinderServiceManager*
+gbinder_servicemanager_new2(
+ const char* dev,
+ const char* sm_protocol,
+ const char* rpc_protocol) /* Since 1.1.20 */
+ G_GNUC_WARN_UNUSED_RESULT;
GBinderServiceManager*
gbinder_defaultservicemanager_new(
@@ -193,7 +201,7 @@
gulong* ids,
guint count); /* Since 1.0.25 */
-#define gbinder_servicemanager_remove_all_handlers(r,ids) \
+#define gbinder_servicemanager_remove_all_handlers(sm,ids) \
gbinder_servicemanager_remove_handlers(sm, ids, G_N_ELEMENTS(ids))
G_END_DECLS
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/include/gbinder_writer.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -55,6 +55,109 @@
guint32 offset;
};
+/*
+ * Note that gbinder_writer_append_struct() doesn't copy the data, it writes
+ * buffer objects pointing to whatever was passed in. The caller must make
+ * sure that those pointers outlive the transaction. That's most commonly
+ * done with by using gbinder_writer_malloc() and friends for allocating
+ * memory for the transaction.
+ *
+ * Below is an example of initializing GBinderWriterType which can then
+ * be passed to gbinder_writer_append_struct(). Fields have to be listed
+ * in the order in which they appear in the structure.
+ *
+ * typedef struct data {
+ * int x;
+ * } Data;
+ *
+ * typedef struct data2 {
+ * int y;
+ * GBinderHidlString str;
+ * GBinderHidlVec vec; // vec<Data>
+ * } Data2;
+ *
+ * static const GBinderWriterType data_t = {
+ * GBINDER_WRITER_STRUCT_NAME_AND_SIZE(Data), NULL
+ * };
+ *
+ * static const GBinderWriterField data2_f[] = {
+ * GBINDER_WRITER_FIELD_HIDL_STRING(Data2,str),
+ * GBINDER_WRITER_FIELD_HIDL_VEC(Data2, vec, &data_t),
+ * GBINDER_WRITER_FIELD_END()
+ * };
+ *
+ * static const GBinderWriterType data2_t = {
+ * GBINDER_WRITER_STRUCT_NAME_AND_SIZE(Data2), data2_f
+ * };
+ */
+
+typedef struct gbinder_writer_type {
+ const char* name;
+ gsize size;
+ const struct gbinder_writer_field* fields;
+} GBinderWriterType; /* Since 1.1.27 */
+
+typedef struct gbinder_writer_field {
+ const char* name;
+ gsize offset;
+ const GBinderWriterType* type;
+ void (*write_buf)(GBinderWriter* writer, const void* ptr,
+ const struct gbinder_writer_field* field, const GBinderParent* parent);
+ gpointer reserved;
+} GBinderWriterField; /* Since 1.1.27 */
+
+#define GBINDER_WRITER_STRUCT_NAME_AND_SIZE(type) \
+ #type, sizeof(type)
+#define GBINDER_WRITER_FIELD_NAME_AND_OFFSET(type,field) \
+ #type "." #field, G_STRUCT_OFFSET(type,field)
+#define GBINDER_WRITER_FIELD_POINTER(type,field,field_type) { \
+ GBINDER_WRITER_FIELD_NAME_AND_OFFSET(type,field), field_type, NULL, NULL }
+#define GBINDER_WRITER_FIELD_HIDL_VEC(type,field,elem) { \
+ GBINDER_WRITER_FIELD_NAME_AND_OFFSET(type,field), elem, \
+ gbinder_writer_field_hidl_vec_write_buf, NULL }
+#define GBINDER_WRITER_FIELD_HIDL_VEC_INT32(type,field) \
+ GBINDER_WRITER_FIELD_HIDL_VEC(type,field, &gbinder_writer_type_int32)
+#define GBINDER_WRITER_FIELD_HIDL_VEC_BYTE(type,field) \
+ GBINDER_WRITER_FIELD_HIDL_VEC(type,field, &gbinder_writer_type_byte)
+#define GBINDER_WRITER_FIELD_HIDL_VEC_STRING(type,field) \
+ GBINDER_WRITER_FIELD_HIDL_VEC(type,field, &gbinder_writer_type_hidl_string)
+#define GBINDER_WRITER_FIELD_HIDL_STRING(type,field) { \
+ GBINDER_WRITER_FIELD_NAME_AND_OFFSET(type,field), NULL, \
+ gbinder_writer_field_hidl_string_write_buf, NULL }
+#define GBINDER_WRITER_FIELD_END() { NULL, 0, NULL, NULL, NULL }
+
+extern const GBinderWriterType gbinder_writer_type_byte; /* Since 1.1.27 */
+extern const GBinderWriterType gbinder_writer_type_int32; /* Since 1.1.27 */
+extern const GBinderWriterType gbinder_writer_type_hidl_string; /* 1.1.27 */
+
+void
+gbinder_writer_append_struct(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterType* type,
+ const GBinderParent* parent); /* Since 1.1.27 */
+
+void
+gbinder_writer_append_struct_vec(
+ GBinderWriter* writer,
+ const void* ptr,
+ guint count,
+ const GBinderWriterType* type); /* Since 1.1.29 */
+
+void
+gbinder_writer_field_hidl_vec_write_buf(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterField* field,
+ const GBinderParent* parent); /* Since 1.1.27 */
+
+void
+gbinder_writer_field_hidl_string_write_buf(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterField* field,
+ const GBinderParent* parent); /* Since 1.1.27 */
+
void
gbinder_writer_append_int8(
GBinderWriter* writer,
@@ -149,6 +252,12 @@
gsize len);
void
+gbinder_writer_append_parcelable(
+ GBinderWriter* writer,
+ const void* buf,
+ gsize len); /* Since 1.1.19 */
+
+void
gbinder_writer_append_hidl_vec(
GBinderWriter* writer,
const void* base,
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_buffer.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -251,6 +251,15 @@
return driver ? gbinder_driver_io(driver) : NULL;
}
+const GBinderRpcProtocol*
+gbinder_buffer_protocol(
+ GBinderBuffer* buf)
+{
+ GBinderDriver* driver = gbinder_buffer_driver(buf);
+
+ return driver ? gbinder_driver_protocol(driver) : NULL;
+}
+
void**
gbinder_buffer_objects(
GBinderBuffer* self)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_buffer_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -73,6 +73,11 @@
GBinderBuffer* buf)
GBINDER_INTERNAL;
+const GBinderRpcProtocol*
+gbinder_buffer_protocol(
+ GBinderBuffer* buf)
+ GBINDER_INTERNAL;
+
void**
gbinder_buffer_objects(
GBinderBuffer* buffer)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_client.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -282,7 +282,8 @@
priv->ranges = g_new0(GBinderClientIfaceRange, 1);
priv->ranges[0].last_code = UINT_MAX;
priv->ranges[0].basic_req = gbinder_local_request_new
- (gbinder_driver_io(driver), NULL);
+ (gbinder_driver_io(driver), gbinder_driver_protocol(driver),
+ NULL);
}
return self;
}
@@ -373,9 +374,10 @@
{
if (G_LIKELY(self)) {
GBinderClientPriv* priv = gbinder_client_cast(self);
- const GBinderIo* io = gbinder_driver_io(self->remote->ipc->driver);
+ GBinderDriver* driver = self->remote->ipc->driver;
- return gbinder_local_request_new(io, priv->ranges->rpc_header);
+ return gbinder_local_request_new(gbinder_driver_io(driver),
+ gbinder_driver_protocol(driver), priv->ranges->rpc_header);
}
return NULL;
}
@@ -387,13 +389,14 @@
{
if (G_LIKELY(self)) {
GBinderClientPriv* priv = gbinder_client_cast(self);
- const GBinderClientIfaceRange* r = gbinder_client_find_range
+ const GBinderClientIfaceRange* range = gbinder_client_find_range
(priv, code);
- if (r) {
- const GBinderIo* io = gbinder_driver_io(self->remote->ipc->driver);
+ if (range) {
+ GBinderDriver* driver = self->remote->ipc->driver;
- return gbinder_local_request_new(io, r->rpc_header);
+ return gbinder_local_request_new(gbinder_driver_io(driver),
+ gbinder_driver_protocol(driver), range->rpc_header);
}
}
return NULL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_config.c
^
|
| @@ -133,9 +133,24 @@
{ NULL, NULL }
};
+/* API level 31 */
+
+static const GBinderConfigPresetEntry gbinder_config_31_servicemanager[] = {
+ { "/dev/binder", "aidl4" },
+ { "/dev/vndbinder", "aidl4" },
+ { NULL, NULL }
+};
+
+static const GBinderConfigPresetGroup gbinder_config_31[] = {
+ { GBINDER_CONFIG_GROUP_PROTOCOL, gbinder_config_30_protocol },
+ { GBINDER_CONFIG_GROUP_SERVICEMANAGER, gbinder_config_31_servicemanager },
+ { NULL, NULL }
+};
+
/* Presets sorted by API level in descending order */
static const GBinderConfigPreset gbinder_config_presets[] = {
+ { 31, gbinder_config_31 },
{ 30, gbinder_config_30 },
{ 29, gbinder_config_29 },
{ 28, gbinder_config_28 }
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_driver.c
^
|
| @@ -1324,8 +1324,9 @@
gbinder_driver_local_request_new_ping(
GBinderDriver* self)
{
- GBinderLocalRequest* req = gbinder_local_request_new(self->io, NULL);
GBinderWriter writer;
+ GBinderLocalRequest* req = gbinder_local_request_new(self->io,
+ self->protocol, NULL);
gbinder_local_request_init_writer(req, &writer);
self->protocol->write_ping(&writer);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_io.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -35,6 +35,7 @@
#include "gbinder_local_object_p.h"
#include "gbinder_remote_object_p.h"
#include "gbinder_object_registry.h"
+#include "gbinder_rpc_protocol.h"
#include "gbinder_writer.h"
#include "gbinder_system.h"
#include "gbinder_log.h"
@@ -94,7 +95,8 @@
static
gsize
GBINDER_IO_FN(object_size)(
- const void* obj)
+ const void* obj,
+ const GBinderRpcProtocol* protocol)
{
if (obj) {
const struct binder_object_header* hdr = obj;
@@ -104,7 +106,8 @@
case BINDER_TYPE_WEAK_BINDER:
case BINDER_TYPE_HANDLE:
case BINDER_TYPE_WEAK_HANDLE:
- return sizeof(struct flat_binder_object);
+ return sizeof(struct flat_binder_object) +
+ protocol->flat_binder_object_extra;
case BINDER_TYPE_FD:
return sizeof(struct binder_fd_object);
case BINDER_TYPE_FDA:
@@ -166,7 +169,8 @@
guint
GBINDER_IO_FN(encode_local_object)(
void* out,
- GBinderLocalObject* obj)
+ GBinderLocalObject* obj,
+ const GBinderRpcProtocol* protocol)
{
struct flat_binder_object* dest = out;
@@ -176,9 +180,14 @@
dest->flags = 0x7f | FLAT_BINDER_FLAG_ACCEPTS_FDS;
dest->binder = (uintptr_t)obj;
} else {
- dest->hdr.type = BINDER_TYPE_WEAK_BINDER;
+ dest->hdr.type = BINDER_TYPE_HANDLE;
}
- return sizeof(*dest);
+ if (protocol->finish_flatten_binder) {
+ protocol->finish_flatten_binder(dest + 1, obj);
+ } else if (protocol->flat_binder_object_extra) {
+ memset(dest + 1, 0, protocol->flat_binder_object_extra);
+ }
+ return sizeof(*dest) + protocol->flat_binder_object_extra;
}
static
@@ -280,7 +289,7 @@
/* We never send these cookies and don't expect them back */
dest->ptr = (uintptr_t)obj;
dest->cookie = 0;
- return sizeof(dest);
+ return sizeof(*dest);
}
/* Fills binder_transaction_data for BC_TRANSACTION/REPLY */
@@ -500,7 +509,8 @@
guint
GBINDER_IO_FN(decode_binder_handle)(
const void* data,
- guint32* handle)
+ guint32* handle,
+ const GBinderRpcProtocol* protocol)
{
const struct flat_binder_object* obj = data;
@@ -509,7 +519,7 @@
if (handle) {
*handle = obj->handle;
}
- return sizeof(*obj);
+ return sizeof(*obj) + protocol->flat_binder_object_extra;
}
return 0;
}
@@ -520,7 +530,8 @@
const void* data,
gsize size,
GBinderObjectRegistry* reg,
- GBinderRemoteObject** out)
+ GBinderRemoteObject** out,
+ const GBinderRpcProtocol* protocol)
{
const struct flat_binder_object* obj = data;
@@ -530,15 +541,18 @@
if (out) {
*out = gbinder_object_registry_get_remote(reg, obj->handle,
REMOTE_REGISTRY_CAN_CREATE_AND_ACQUIRE);
+ if (*out && protocol->finish_unflatten_binder) {
+ protocol->finish_unflatten_binder(obj + 1, *out);
+ }
}
- return sizeof(*obj);
+ return sizeof(*obj) + protocol->flat_binder_object_extra;
case BINDER_TYPE_BINDER:
if (!obj->binder) {
/* That's a NULL reference */
if (out) {
*out = NULL;
}
- return sizeof(*obj);
+ return sizeof(*obj) + protocol->flat_binder_object_extra;
}
/* fallthrough */
default:
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_io.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -126,7 +126,7 @@
} br;
/* Size of the object and its extra data */
- gsize (*object_size)(const void* obj);
+ gsize (*object_size)(const void* obj, const GBinderRpcProtocol* protocol);
gsize (*object_data_size)(const void* obj);
/* Writes pointer to the buffer. The destination buffer must have
@@ -142,8 +142,9 @@
guint (*encode_cookie)(void* out, guint64 cookie);
/* Encode flat_buffer_object */
-#define GBINDER_MAX_BINDER_OBJECT_SIZE (24)
- guint (*encode_local_object)(void* out, GBinderLocalObject* obj);
+#define GBINDER_MAX_BINDER_OBJECT_SIZE (28)
+ guint (*encode_local_object)(void* out, GBinderLocalObject* obj,
+ const GBinderRpcProtocol* protocol);
guint (*encode_remote_object)(void* out, GBinderRemoteObject* obj);
guint (*encode_fd_object)(void* out, int fd);
guint (*encode_fda_object)(void* out, const GBinderFds *fds,
@@ -189,9 +190,11 @@
void (*decode_transaction_data)(const void* data, GBinderIoTxData* tx);
void* (*decode_ptr_cookie)(const void* data);
guint (*decode_cookie)(const void* data, guint64* cookie);
- guint (*decode_binder_handle)(const void* obj, guint32* handle);
+ guint (*decode_binder_handle)(const void* obj, guint32* handle,
+ const GBinderRpcProtocol* protocol);
guint (*decode_binder_object)(const void* data, gsize size,
- GBinderObjectRegistry* reg, GBinderRemoteObject** obj);
+ GBinderObjectRegistry* reg, GBinderRemoteObject** obj,
+ const GBinderRpcProtocol* protocol);
guint (*decode_buffer_object)(GBinderBuffer* buf, gsize offset,
GBinderIoBufferObject* out);
guint (*decode_fd_object)(const void* data, gsize size, int* fd);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_ipc.c
^
|
| @@ -58,11 +58,13 @@
#include <time.h>
typedef struct gbinder_ipc_looper GBinderIpcLooper;
+typedef GObjectClass GBinderIpcClass;
struct gbinder_ipc_priv {
GBinderIpc* self;
GThreadPool* tx_pool;
GHashTable* tx_table;
+ char* dev;
char* key;
const char* name;
GBinderObjectRegistry object_registry;
@@ -78,11 +80,12 @@
GBinderIpcLooper* blocked_loopers;
};
-typedef GObjectClass GBinderIpcClass;
+#define PARENT_CLASS gbinder_ipc_parent_class
+#define THIS_TYPE gbinder_ipc_get_type()
+#define THIS(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, THIS_TYPE, GBinderIpc)
+
+GType THIS_TYPE GBINDER_INTERNAL;
G_DEFINE_TYPE(GBinderIpc, gbinder_ipc, G_TYPE_OBJECT)
-#define GBINDER_TYPE_IPC (gbinder_ipc_get_type())
-#define GBINDER_IPC(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- GBINDER_TYPE_IPC, GBinderIpc))
/*
* Binder requests are blocking, worker threads are needed in order to
@@ -263,6 +266,15 @@
return FALSE;
}
+static
+char*
+gbinder_ipc_make_key(
+ const char* dev,
+ const char* protocol)
+{
+ return g_strdup_printf("%s:%s", protocol, dev);
+}
+
/*==========================================================================*
* GBinderIpcLooperTx
*==========================================================================*/
@@ -1841,20 +1853,25 @@
GBinderIpc*
gbinder_ipc_new(
- const char* dev)
+ const char* dev,
+ const char* protocol_name)
{
GBinderIpc* self = NULL;
- const GBinderRpcProtocol* protocol;
+ char* key;
+ const GBinderRpcProtocol* protocol = (protocol_name ?
+ gbinder_rpc_protocol_by_name(protocol_name) : NULL);
if (!dev || !dev[0]) dev = GBINDER_DEFAULT_BINDER;
- protocol = gbinder_rpc_protocol_for_device(dev); /* Never returns NULL */
+ if (!protocol) protocol = gbinder_rpc_protocol_for_device(dev);
+ key = gbinder_ipc_make_key(dev, protocol->name);
/* Lock */
pthread_mutex_lock(&gbinder_ipc_mutex);
if (gbinder_ipc_table) {
- self = g_hash_table_lookup(gbinder_ipc_table, dev);
+ self = g_hash_table_lookup(gbinder_ipc_table, key);
}
if (self) {
+ g_free(key);
gbinder_ipc_ref(self);
} else {
GBinderDriver* driver = gbinder_driver_new(dev, protocol);
@@ -1862,10 +1879,11 @@
if (driver) {
GBinderIpcPriv* priv;
- self = g_object_new(GBINDER_TYPE_IPC, NULL);
+ self = g_object_new(THIS_TYPE, NULL);
priv = self->priv;
self->driver = driver;
- self->dev = priv->key = g_strdup(dev);
+ self->dev = priv->dev = g_strdup(dev);
+ priv->key = key;
self->priv->object_registry.io = gbinder_driver_io(driver);
/* gbinder_ipc_dispose will remove iself from the table */
if (!gbinder_ipc_table) {
@@ -1873,8 +1891,10 @@
}
g_hash_table_replace(gbinder_ipc_table, priv->key, self);
/* With "/dev/" prefix, it may be too long to be a thread name */
- priv->name = priv->key +
- (g_str_has_prefix(priv->key, "/dev/") ? 5 : 0);
+ priv->name = self->dev +
+ (g_str_has_prefix(priv->dev, "/dev/") ? 5 : 0);
+ } else {
+ g_free(key);
}
}
pthread_mutex_unlock(&gbinder_ipc_mutex);
@@ -1887,7 +1907,7 @@
GBinderIpc* self)
{
if (G_LIKELY(self)) {
- g_object_ref(GBINDER_IPC(self));
+ g_object_ref(THIS(self));
return self;
} else {
return NULL;
@@ -1899,7 +1919,7 @@
GBinderIpc* self)
{
if (G_LIKELY(self)) {
- g_object_unref(GBINDER_IPC(self));
+ g_object_unref(THIS(self));
}
}
@@ -2037,7 +2057,7 @@
.get_local = gbinder_ipc_object_registry_get_local,
.get_remote = gbinder_ipc_object_registry_get_remote
};
- GBinderIpcPriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, GBINDER_TYPE_IPC,
+ GBinderIpcPriv* priv = G_TYPE_INSTANCE_GET_PRIVATE(self, THIS_TYPE,
GBinderIpcPriv);
g_mutex_init(&priv->looper_mutex);
@@ -2088,7 +2108,7 @@
gbinder_ipc_dispose(
GObject* object)
{
- GBinderIpc* self = GBINDER_IPC(object);
+ GBinderIpc* self = THIS(object);
GVERBOSE_("%s", self->dev);
/* Lock */
@@ -2112,7 +2132,7 @@
/* Unlock */
gbinder_ipc_stop_loopers(self);
- G_OBJECT_CLASS(gbinder_ipc_parent_class)->finalize(object);
+ G_OBJECT_CLASS(PARENT_CLASS)->dispose(object);
}
static
@@ -2120,7 +2140,7 @@
gbinder_ipc_finalize(
GObject* object)
{
- GBinderIpc* self = GBINDER_IPC(object);
+ GBinderIpc* self = THIS(object);
GBinderIpcPriv* priv = self->priv;
GASSERT(!priv->local_objects);
@@ -2134,8 +2154,9 @@
GASSERT(!g_hash_table_size(priv->tx_table));
g_hash_table_unref(priv->tx_table);
gbinder_driver_unref(self->driver);
+ g_free(priv->dev);
g_free(priv->key);
- G_OBJECT_CLASS(gbinder_ipc_parent_class)->finalize(object);
+ G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
}
static
@@ -2171,7 +2192,7 @@
/* Unlock */
for (i = ipcs; i; i = i->next) {
- GBinderIpc* ipc = GBINDER_IPC(i->data);
+ GBinderIpc* ipc = THIS(i->data);
GBinderIpcPriv* priv = ipc->priv;
GThreadPool* pool = priv->tx_pool;
GSList* local_objs = NULL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_ipc.h
^
|
| @@ -100,7 +100,8 @@
GBinderIpc*
gbinder_ipc_new(
- const char* dev)
+ const char* dev,
+ const char* protocol)
GBINDER_INTERNAL;
GBinderIpc*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_object.c
^
|
| @@ -90,6 +90,15 @@
*==========================================================================*/
static
+GBinderLocalReply*
+gbinder_local_object_create_reply(
+ GBinderLocalObject* self)
+{
+ return gbinder_local_reply_new(gbinder_local_object_io(self),
+ gbinder_local_object_protocol(self));
+}
+
+static
GBINDER_LOCAL_TRANSACTION_SUPPORT
gbinder_local_object_default_can_handle_transaction(
GBinderLocalObject* self,
@@ -139,8 +148,7 @@
GBinderRemoteRequest* req,
int* status)
{
- const GBinderIo* io = gbinder_local_object_io(self);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderLocalReply* reply = gbinder_local_object_create_reply(self);
GVERBOSE(" PING_TRANSACTION");
gbinder_local_reply_append_int32(reply, GBINDER_STATUS_OK);
@@ -155,9 +163,8 @@
GBinderRemoteRequest* req,
int* status)
{
- const GBinderIo* io = gbinder_local_object_io(self);
GBinderLocalObjectPriv* priv = self->priv;
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderLocalReply* reply = gbinder_local_object_create_reply(self);
GVERBOSE(" INTERFACE_TRANSACTION");
gbinder_local_reply_append_string16(reply, priv->ifaces[0]);
@@ -173,8 +180,7 @@
int* status)
{
/*android.hidl.base@1.0::IBase interfaceDescriptor() */
- const GBinderIo* io = gbinder_local_object_io(self);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderLocalReply* reply = gbinder_local_object_create_reply(self);
GVERBOSE(" HIDL_PING_TRANSACTION \"%s\"",
gbinder_remote_request_interface(req));
@@ -191,9 +197,8 @@
int* status)
{
/*android.hidl.base@1.0::IBase interfaceDescriptor() */
- const GBinderIo* io = gbinder_local_object_io(self);
GBinderLocalObjectPriv* priv = self->priv;
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderLocalReply* reply = gbinder_local_object_create_reply(self);
GBinderWriter writer;
GVERBOSE(" HIDL_GET_DESCRIPTOR_TRANSACTION \"%s\"",
@@ -213,8 +218,7 @@
int* status)
{
/*android.hidl.base@1.0::IBase interfaceChain() */
- const GBinderIo* io = gbinder_local_object_io(self);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderLocalReply* reply = gbinder_local_object_create_reply(self);
GBinderWriter writer;
GVERBOSE(" HIDL_DESCRIPTOR_CHAIN_TRANSACTION \"%s\"",
@@ -480,7 +484,7 @@
GBinderLocalObject* self)
{
if (G_LIKELY(self)) {
- return gbinder_local_reply_new(gbinder_local_object_io(self));
+ return gbinder_local_object_create_reply(self);
}
return NULL;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_object_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -92,6 +92,8 @@
#define gbinder_local_object_dev(obj) (gbinder_driver_dev((obj)->ipc->driver))
#define gbinder_local_object_io(obj) (gbinder_driver_io((obj)->ipc->driver))
+#define gbinder_local_object_protocol(obj) \
+ (gbinder_driver_protocol((obj)->ipc->driver))
GBinderLocalObject*
gbinder_local_object_new_with_type(
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_reply.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -72,10 +72,12 @@
GBinderLocalReply*
gbinder_local_reply_new(
- const GBinderIo* io)
+ const GBinderIo* io,
+ const GBinderRpcProtocol* protocol)
{
GASSERT(io);
- if (io) {
+ GASSERT(protocol);
+ if (io && protocol) {
GBinderLocalReply* self = g_slice_new0(GBinderLocalReply);
GBinderWriterData* data = &self->data;
GBinderOutputData* out = &self->out;
@@ -87,6 +89,7 @@
g_atomic_int_set(&self->refcount, 1);
data->io = io;
+ data->protocol = protocol;
out->bytes = data->bytes = g_byte_array_new();
out->f = &local_reply_output_fn;
return self;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_reply_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -39,7 +39,8 @@
GBinderLocalReply*
gbinder_local_reply_new(
- const GBinderIo* io)
+ const GBinderIo* io,
+ const GBinderRpcProtocol* protocol)
GBINDER_INTERNAL;
GBinderOutputData*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_request.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -74,10 +74,12 @@
GBinderLocalRequest*
gbinder_local_request_new(
const GBinderIo* io,
+ const GBinderRpcProtocol* protocol,
GBytes* init)
{
GASSERT(io);
- if (io) {
+ GASSERT(protocol);
+ if (io && protocol) {
GBinderLocalRequest* self = g_slice_new0(GBinderLocalRequest);
GBinderWriterData* writer = &self->data;
GBinderOutputData* out = &self->out;
@@ -89,6 +91,7 @@
g_atomic_int_set(&self->refcount, 1);
writer->io = io;
+ writer->protocol = protocol;
if (init) {
gsize size;
gconstpointer data = g_bytes_get_data(init, &size);
@@ -111,9 +114,10 @@
const GBinderRpcProtocol* protocol,
const char* iface)
{
- GBinderLocalRequest* self = gbinder_local_request_new(io, NULL);
+ GBinderLocalRequest* self = gbinder_local_request_new(io, protocol, NULL);
- if (self && G_LIKELY(protocol) && G_LIKELY(iface)) {
+ /* gbinder_local_request_new() fails if protocol is NULL */
+ if (self && G_LIKELY(iface)) {
GBinderWriter writer;
gbinder_local_request_init_writer(self, &writer);
@@ -128,7 +132,7 @@
GBinderObjectConverter* convert)
{
GBinderLocalRequest* self = gbinder_local_request_new
- (gbinder_buffer_io(buffer), NULL);
+ (gbinder_buffer_io(buffer), gbinder_buffer_protocol(buffer), NULL);
if (self) {
gbinder_writer_data_append_contents(&self->data, buffer, 0, convert);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_local_request_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -40,6 +40,7 @@
GBinderLocalRequest*
gbinder_local_request_new(
const GBinderIo* io,
+ const GBinderRpcProtocol* protocol,
GBytes* init)
GBINDER_INTERNAL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_reader.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -352,7 +352,8 @@
if (gbinder_reader_can_read_object(p)) {
const GBinderReaderData* data = p->data;
const guint eaten = data->reg->io->decode_binder_object(p->ptr,
- gbinder_reader_bytes_remaining(reader), data->reg, out);
+ gbinder_reader_bytes_remaining(reader), data->reg, out,
+ gbinder_buffer_protocol(data->buffer));
if (eaten) {
p->ptr += eaten;
@@ -420,6 +421,40 @@
return gbinder_reader_read_buffer_object(reader, NULL);
}
+/*
+ * This is supposed to be used to read aidl parcelables, and is not
+ * guaranteed to work on any other kind of parcelable.
+ */
+const void*
+gbinder_reader_read_parcelable(
+ GBinderReader* reader,
+ gsize* size) /* Since 1.1.19 */
+{
+ guint32 non_null, payload_size = 0;
+
+ if (gbinder_reader_read_uint32(reader, &non_null) && non_null &&
+ gbinder_reader_read_uint32(reader, &payload_size) &&
+ payload_size >= sizeof(payload_size)) {
+ GBinderReaderPriv* p = gbinder_reader_cast(reader);
+
+ payload_size -= sizeof(payload_size);
+ if (p->ptr + payload_size <= p->end) {
+ const void* out = p->ptr;
+
+ /* Success */
+ p->ptr += payload_size;
+ if (size) {
+ *size = payload_size;
+ }
+ return out;
+ }
+ }
+ if (size) {
+ *size = 0;
+ }
+ return NULL;
+}
+
/* Helper for gbinder_reader_read_hidl_struct() macro */
const void*
gbinder_reader_read_hidl_struct1(
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_remote_reply.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -131,8 +131,9 @@
GBinderObjectRegistry* reg = d->reg;
if (reg) {
- return gbinder_local_reply_set_contents
- (gbinder_local_reply_new(reg->io), d->buffer, convert);
+ return gbinder_local_reply_set_contents(gbinder_local_reply_new
+ (reg->io, gbinder_buffer_protocol(d->buffer)),
+ d->buffer, convert);
}
}
return NULL;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_rpc_protocol.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2020 Jolla Ltd.
- * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -212,12 +212,23 @@
return *iface;
}
+static
+void
+gbinder_rpc_protocol_aidl3_finish_flatten_binder(
+ void* out,
+ GBinderLocalObject* obj)
+{
+ *(guint32*)out = GBINDER_STABILITY_SYSTEM;
+}
+
static const GBinderRpcProtocol gbinder_rpc_protocol_aidl3 = {
.name = "aidl3",
.ping_tx = GBINDER_PING_TRANSACTION,
.write_ping = gbinder_rpc_protocol_aidl_write_ping, /* no payload */
.write_rpc_header = gbinder_rpc_protocol_aidl3_write_rpc_header,
- .read_rpc_header = gbinder_rpc_protocol_aidl3_read_rpc_header
+ .read_rpc_header = gbinder_rpc_protocol_aidl3_read_rpc_header,
+ .flat_binder_object_extra = 4,
+ .finish_flatten_binder = gbinder_rpc_protocol_aidl3_finish_flatten_binder
};
/*==========================================================================*
@@ -379,6 +390,13 @@
return gbinder_rpc_protocol_default;
}
+const GBinderRpcProtocol*
+gbinder_rpc_protocol_by_name(
+ const char* protocol_name)
+{
+ return gbinder_rpc_protocol_find(protocol_name);
+}
+
/*
* Local Variables:
* mode: C
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_rpc_protocol.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2020 Jolla Ltd.
- * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -47,8 +47,24 @@
void (*write_rpc_header)(GBinderWriter* writer, const char* iface);
const char* (*read_rpc_header)(GBinderReader* reader, guint32 txcode,
char** iface);
+
+ /*
+ * For the sake of simplicity, let's assume that the trailer has a
+ * fixed size and that size is the same on both 32 and 64 bit platforms.
+ * Also note that finish_unflatten_binder() is only invoked for the
+ * remote objects that are not NULL, otherwise flat_binder_object_extra
+ * bytes are just skipped.
+ */
+ gsize flat_binder_object_extra;
+ void (*finish_flatten_binder)(void* out, GBinderLocalObject* obj);
+ void (*finish_unflatten_binder)(const void* in, GBinderRemoteObject* obj);
};
+const GBinderRpcProtocol*
+gbinder_rpc_protocol_by_name(
+ const char* protocol_name)
+ GBINDER_INTERNAL;
+
/* Returns one of the above based on the device name */
const GBinderRpcProtocol*
gbinder_rpc_protocol_for_device(
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -83,11 +83,12 @@
{ "aidl", gbinder_servicemanager_aidl_get_type },
{ "aidl2", gbinder_servicemanager_aidl2_get_type },
{ "aidl3", gbinder_servicemanager_aidl3_get_type },
+ { "aidl4", gbinder_servicemanager_aidl4_get_type },
{ "hidl", gbinder_servicemanager_hidl_get_type }
};
#define SERVICEMANAGER_TYPE_AIDL (gbinder_servicemanager_types + 0)
-#define SERVICEMANAGER_TYPE_HIDL (gbinder_servicemanager_types + 3)
+#define SERVICEMANAGER_TYPE_HIDL (gbinder_servicemanager_types + 4)
#define SERVICEMANAGER_TYPE_DEFAULT SERVICEMANAGER_TYPE_AIDL
static GHashTable* gbinder_servicemanager_map = NULL;
@@ -519,7 +520,8 @@
GBinderServiceManager*
gbinder_servicemanager_new_with_type(
GType type,
- const char* dev)
+ const char* dev,
+ const char* rpc_protocol)
{
GBinderServiceManager* self = NULL;
GBinderServiceManagerClass* klass = gbinder_servicemanager_class_ref(type);
@@ -528,7 +530,7 @@
GBinderIpc* ipc;
if (!dev) dev = klass->default_device;
- ipc = gbinder_ipc_new(dev);
+ ipc = gbinder_ipc_new(dev, rpc_protocol);
if (ipc) {
/* Create a (possibly) dead service manager object */
GBinderRemoteObject* object = gbinder_ipc_get_service_manager(ipc);
@@ -620,25 +622,36 @@
gbinder_servicemanager_new(
const char* dev)
{
- if (dev) {
- const GBinderServiceManagerType* type = NULL;
+ return gbinder_servicemanager_new2(dev, NULL, NULL);
+}
- if (!gbinder_servicemanager_map) {
- const GBinderServiceManagerType* t;
+GBinderServiceManager*
+gbinder_servicemanager_new2(
+ const char* dev,
+ const char* sm_protocol,
+ const char* rpc_protocol) /* Since 1.1.20 */
+{
+ if (!dev) {
+ return NULL;
+ } else if (!sm_protocol) {
+ const GBinderServiceManagerType* type;
- /* One-time initialization */
+ /* One-time initialization */
+ if (!gbinder_servicemanager_map) {
gbinder_servicemanager_map = gbinder_servicemanager_load_config();
/* "Default" is a special value stored in a special variable */
- t = g_hash_table_lookup(gbinder_servicemanager_map, CONF_DEFAULT);
- if (t) {
+ type = g_hash_table_lookup(gbinder_servicemanager_map,
+ CONF_DEFAULT);
+ if (type) {
g_hash_table_remove(gbinder_servicemanager_map, CONF_DEFAULT);
- gbinder_servicemanager_default = t;
+ gbinder_servicemanager_default = type;
} else {
gbinder_servicemanager_default = SERVICEMANAGER_TYPE_DEFAULT;
}
}
+ /* If no protocol is specified, pick one up based on the device name */
type = g_hash_table_lookup(gbinder_servicemanager_map, dev);
if (type) {
GDEBUG("Using %s service manager for %s", type->name, dev);
@@ -646,9 +659,21 @@
type = gbinder_servicemanager_default;
GDEBUG("Using default service manager %s for %s", type->name, dev);
}
- return gbinder_servicemanager_new_with_type(type->get_type(), dev);
+ return gbinder_servicemanager_new_with_type(type->get_type(), dev,
+ rpc_protocol);
+ } else {
+ /* If protocol name is specified, it must be a valid one */
+ const GBinderServiceManagerType* type =
+ gbinder_servicemanager_value_map(sm_protocol);
+
+ if (type) {
+ return gbinder_servicemanager_new_with_type(type->get_type(), dev,
+ rpc_protocol);
+ } else {
+ GWARN("Unknown servicemanager protocol %s", sm_protocol);
+ return NULL;
+ }
}
- return NULL;
}
GBinderLocalObject*
@@ -1016,7 +1041,7 @@
const char* dev)
{
return gbinder_servicemanager_new_with_type
- (gbinder_servicemanager_aidl_get_type(), dev);
+ (gbinder_servicemanager_aidl_get_type(), dev, NULL);
}
GBinderServiceManager*
@@ -1024,7 +1049,7 @@
const char* dev)
{
return gbinder_servicemanager_new_with_type
- (gbinder_servicemanager_hidl_get_type(), dev);
+ (gbinder_servicemanager_hidl_get_type(), dev, NULL);
}
/*==========================================================================*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_aidl.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2020 Jolla Ltd.
- * Copyright (C) 2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -51,10 +51,6 @@
#define GBINDER_TYPE_SERVICEMANAGER_AIDL \
gbinder_servicemanager_aidl_get_type()
-#define GBINDER_SERVICEMANAGER_AIDL_CLASS(klass) \
- G_TYPE_CHECK_CLASS_CAST((klass), GBINDER_TYPE_SERVICEMANAGER_AIDL, \
- GBinderServiceManagerAidlClass)
-
#define GBINDER_SERVICEMANAGER_AIDL_GET_CLASS(obj) \
G_TYPE_INSTANCE_GET_CLASS((obj), GBINDER_TYPE_SERVICEMANAGER_AIDL, \
GBinderServiceManagerAidlClass)
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_aidl2.c
^
|
| @@ -45,8 +45,6 @@
GBINDER_TYPE_SERVICEMANAGER_AIDL)
#define PARENT_CLASS gbinder_servicemanager_aidl2_parent_class
-#define DUMP_FLAG_PRIORITY_DEFAULT (0x08)
-#define DUMP_FLAG_PRIORITY_ALL (0x0f)
static
GBinderLocalRequest*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_aidl3.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
- * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021-2022 Jolla Ltd.
+ * Copyright (C) 2021-2022 Slava Monich <slava.monich@jolla.com>
* Copyright (C) 2021 Gary Wang <gary.wang@canonical.com>
* Copyright (C) 2021 Madhushan Nishantha <jlmadushan@gmail.com>
*
@@ -32,7 +32,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "gbinder_servicemanager_aidl.h"
+#include "gbinder_servicemanager_aidl_p.h"
#include "gbinder_client_p.h"
#include "gbinder_reader_p.h"
@@ -50,14 +50,6 @@
#define PARENT_CLASS gbinder_servicemanager_aidl3_parent_class
-enum gbinder_stability_level {
- UNDECLARED = 0,
- VENDOR = 0b000011,
- SYSTEM = 0b001100,
- VINTF = 0b111111
-};
-
-static
GBinderRemoteObject*
gbinder_servicemanager_aidl3_get_service(
GBinderServiceManager* self,
@@ -76,7 +68,7 @@
CHECK_SERVICE_TRANSACTION, req, status, api);
gbinder_remote_reply_init_reader(reply, &reader);
- gbinder_reader_read_int32(&reader, NULL /* stability */);
+ gbinder_reader_read_int32(&reader, NULL /* status? */);
obj = gbinder_reader_read_object(&reader);
gbinder_remote_reply_unref(reply);
@@ -84,28 +76,6 @@
return obj;
}
-static
-GBinderLocalRequest*
-gbinder_servicemanager_aidl3_add_service_req(
- GBinderClient* client,
- const char* name,
- GBinderLocalObject* obj)
-{
- GBinderLocalRequest* req = gbinder_client_new_request(client);
-
- gbinder_local_request_append_string16(req, name);
- gbinder_local_request_append_local_object(req, obj);
- /*
- * Starting from Android 11, to add a service, Android framework requires
- * an additional field `stability` when reading a strong binder.
- */
- gbinder_local_request_append_int32(req, SYSTEM);
- gbinder_local_request_append_int32(req, 0);
- gbinder_local_request_append_int32(req, DUMP_FLAG_PRIORITY_DEFAULT);
- return req;
-}
-
-static
char**
gbinder_servicemanager_aidl3_list(
GBinderServiceManager* manager,
@@ -149,6 +119,22 @@
}
static
+GBinderLocalRequest*
+gbinder_servicemanager_aidl3_add_service_req(
+ GBinderClient* client,
+ const char* name,
+ GBinderLocalObject* obj)
+{
+ GBinderLocalRequest* req = gbinder_client_new_request(client);
+
+ gbinder_local_request_append_string16(req, name);
+ gbinder_local_request_append_local_object(req, obj);
+ gbinder_local_request_append_int32(req, 0);
+ gbinder_local_request_append_int32(req, DUMP_FLAG_PRIORITY_DEFAULT);
+ return req;
+}
+
+static
void
gbinder_servicemanager_aidl3_init(
GBinderServiceManagerAidl3* self)
|
|
[-]
[+]
|
Added |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_aidl4.c
^
|
| @@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021 Gary Wang <gary.wang@canonical.com>
+ * Copyright (C) 2021 Madhushan Nishantha <jlmadushan@gmail.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "gbinder_servicemanager_aidl_p.h"
+#include "gbinder_client_p.h"
+#include "gbinder_reader_p.h"
+
+#include <gbinder_local_request.h>
+#include <gbinder_remote_reply.h>
+
+/* Variant of AIDL servicemanager appeared in Android 12 (API level 31) */
+
+typedef GBinderServiceManagerAidl GBinderServiceManagerAidl4;
+typedef GBinderServiceManagerAidlClass GBinderServiceManagerAidl4Class;
+
+G_DEFINE_TYPE(GBinderServiceManagerAidl4,
+ gbinder_servicemanager_aidl4,
+ GBINDER_TYPE_SERVICEMANAGER_AIDL)
+
+#define PARENT_CLASS gbinder_servicemanager_aidl4_parent_class
+
+#define BINDER_WIRE_FORMAT_VERSION (1)
+
+static
+GBinderLocalRequest*
+gbinder_servicemanager_aidl4_add_service_req(
+ GBinderClient* client,
+ const char* name,
+ GBinderLocalObject* obj)
+{
+ GBinderLocalRequest* req = gbinder_client_new_request(client);
+
+ gbinder_local_request_append_string16(req, name);
+ gbinder_local_request_append_local_object(req, obj);
+
+ /*
+ * When reading nullable strong binder, from Android 12, the format of
+ * the `stability` field passed on the wire was changed and evolved to
+ * `struct Category`, which consists of the following members with 4 bytes
+ * long.
+ *
+ * struct Category {
+ * uint8_t version;
+ * uint8_t reserved[2];
+ * Level level; <- bitmask of Stability::Level
+ * }
+ *
+ * Hmmm, is that ^ really true?
+ */
+ gbinder_local_request_append_int32(req,
+ GBINDER_FOURCC(GBINDER_STABILITY_SYSTEM, 0, 0,
+ BINDER_WIRE_FORMAT_VERSION));
+ gbinder_local_request_append_int32(req, 0);
+ gbinder_local_request_append_int32(req, DUMP_FLAG_PRIORITY_DEFAULT);
+
+ return req;
+}
+
+static
+void
+gbinder_servicemanager_aidl4_init(
+ GBinderServiceManagerAidl* self)
+{
+}
+
+static
+void
+gbinder_servicemanager_aidl4_class_init(
+ GBinderServiceManagerAidl4Class* cls)
+{
+ GBinderServiceManagerClass* manager = GBINDER_SERVICEMANAGER_CLASS(cls);
+ cls->add_service_req = gbinder_servicemanager_aidl4_add_service_req;
+ manager->list = gbinder_servicemanager_aidl3_list;
+ manager->get_service = gbinder_servicemanager_aidl3_get_service;
+}
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
+
|
|
[-]
[+]
|
Added |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_aidl_p.h
^
|
| @@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2018-2021 Jolla Ltd.
+ * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021 Gary Wang <gary.wang@canonical.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef GBINDER_SERVICEMANAGER_AIDL_PRIVATE_H
+#define GBINDER_SERVICEMANAGER_AIDL_PRIVATE_H
+
+#include "gbinder_servicemanager_aidl.h"
+
+char**
+gbinder_servicemanager_aidl3_list(
+ GBinderServiceManager* manager,
+ const GBinderIpcSyncApi* api)
+ GBINDER_INTERNAL;
+
+GBinderRemoteObject*
+gbinder_servicemanager_aidl3_get_service(
+ GBinderServiceManager* manager,
+ const char* name,
+ int* status,
+ const GBinderIpcSyncApi* api)
+ GBINDER_INTERNAL;
+
+#endif /* GBINDER_SERVICEMANAGER_AIDL_PRIVATE_H */
+
+/*
+ * Local Variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicemanager_p.h
^
|
| @@ -90,7 +90,8 @@
GBinderServiceManager*
gbinder_servicemanager_new_with_type(
GType type,
- const char* dev)
+ const char* dev,
+ const char* rpc_protocol)
GBINDER_INTERNAL;
void
@@ -111,6 +112,7 @@
GType gbinder_servicemanager_aidl_get_type(void) GBINDER_INTERNAL;
GType gbinder_servicemanager_aidl2_get_type(void) GBINDER_INTERNAL;
GType gbinder_servicemanager_aidl3_get_type(void) GBINDER_INTERNAL;
+GType gbinder_servicemanager_aidl4_get_type(void) GBINDER_INTERNAL;
GType gbinder_servicemanager_hidl_get_type(void) GBINDER_INTERNAL;
#endif /* GBINDER_SERVICEMANAGER_PRIVATE_H */
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_servicepoll.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2020 Jolla Ltd.
- * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -50,10 +50,12 @@
GBinderEventLoopTimeout* timer;
};
+#define PARENT_CLASS gbinder_servicepoll_parent_class
+#define THIS_TYPE gbinder_servicepoll_get_type()
+#define THIS(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, THIS_TYPE, GBinderServicePoll)
+
+GType THIS_TYPE GBINDER_INTERNAL;
G_DEFINE_TYPE(GBinderServicePoll, gbinder_servicepoll, G_TYPE_OBJECT)
-#define GBINDER_TYPE_SERVICEPOLL (gbinder_servicepoll_get_type())
-#define GBINDER_SERVICEPOLL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
- GBINDER_TYPE_SERVICEPOLL, GBinderServicePoll))
enum gbinder_servicepoll_signal {
SIGNAL_NAME_ADDED,
@@ -76,7 +78,7 @@
char** services,
void* user_data)
{
- GBinderServicePoll* self = GBINDER_SERVICEPOLL(user_data);
+ GBinderServicePoll* self = THIS(user_data);
gbinder_servicepoll_ref(self);
self->list_id = 0;
@@ -122,7 +124,7 @@
gbinder_servicepoll_timer(
gpointer user_data)
{
- GBinderServicePoll* self = GBINDER_SERVICEPOLL(user_data);
+ GBinderServicePoll* self = THIS(user_data);
if (!self->list_id) {
self->list_id = gbinder_servicemanager_list(self->manager,
@@ -136,7 +138,7 @@
gbinder_servicepoll_create(
GBinderServiceManager* manager)
{
- GBinderServicePoll* self = g_object_new(GBINDER_TYPE_SERVICEPOLL, NULL);
+ GBinderServicePoll* self = g_object_new(THIS_TYPE, NULL);
self->manager = gbinder_servicemanager_ref(manager);
self->list_id = gbinder_servicemanager_list(manager,
@@ -171,7 +173,7 @@
GBinderServicePoll* self)
{
if (G_LIKELY(self)) {
- g_object_ref(GBINDER_SERVICEPOLL(self));
+ g_object_ref(THIS(self));
return self;
} else {
return NULL;
@@ -183,7 +185,7 @@
GBinderServicePoll* self)
{
if (G_LIKELY(self)) {
- g_object_unref(GBINDER_SERVICEPOLL(self));
+ g_object_unref(THIS(self));
}
}
@@ -240,12 +242,13 @@
gbinder_servicepoll_finalize(
GObject* object)
{
- GBinderServicePoll* self = GBINDER_SERVICEPOLL(object);
+ GBinderServicePoll* self = THIS(object);
gbinder_timeout_remove(self->timer);
gbinder_servicemanager_cancel(self->manager, self->list_id);
gbinder_servicemanager_unref(self->manager);
g_strfreev(self->list);
+ G_OBJECT_CLASS(PARENT_CLASS)->finalize(object);
}
static
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_types_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -77,6 +77,13 @@
/* As a special case, ServiceManager's handle is zero */
#define GBINDER_SERVICEMANAGER_HANDLE (0)
+typedef enum gbinder_stability_level {
+ GBINDER_STABILITY_UNDECLARED = 0,
+ GBINDER_STABILITY_VENDOR = 0x03,
+ GBINDER_STABILITY_SYSTEM = 0x0c,
+ GBINDER_STABILITY_VINTF = 0x3f
+} GBINDER_STABILITY_LEVEL;
+
#endif /* GBINDER_TYPES_PRIVATE_H */
/*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_writer.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -52,6 +52,20 @@
GBinderWriterData* data;
} GBinderWriterPriv;
+const GBinderWriterType gbinder_writer_type_byte = { "int32", 4, NULL };
+const GBinderWriterType gbinder_writer_type_int32 = { "byte", 1, NULL };
+static const GBinderWriterField gbinder_writer_type_hidl_string_f[] = {
+ {
+ "hidl_string.data.str", 0, NULL,
+ gbinder_writer_field_hidl_string_write_buf, NULL
+ },
+ GBINDER_WRITER_FIELD_END()
+};
+const GBinderWriterType gbinder_writer_type_hidl_string = {
+ "hidl_string", sizeof(GBinderHidlString),
+ gbinder_writer_type_hidl_string_f
+};
+
G_STATIC_ASSERT(sizeof(GBinderWriter) >= sizeof(GBinderWriterPriv));
GBINDER_INLINE_FUNC GBinderWriterPriv* gbinder_writer_cast(GBinderWriter* pub)
@@ -92,6 +106,7 @@
gbinder_buffer_contents_ref(contents));
if (objects && *objects) {
const GBinderIo* io = gbinder_buffer_io(buffer);
+ const GBinderRpcProtocol* proto = gbinder_buffer_protocol(buffer);
/* GBinderIo must be the same because it's defined by the kernel */
GASSERT(io == data->io);
@@ -114,21 +129,22 @@
gutil_int_array_append(data->offsets, dest->len);
/* Convert remote object into local if necessary */
- if (convert && io->decode_binder_handle(obj, &handle) &&
+ if (convert && io->decode_binder_handle(obj, &handle, proto) &&
(local = gbinder_object_converter_handle_to_local
(convert, handle))) {
const guint pos = dest->len;
g_byte_array_set_size(dest, pos +
GBINDER_MAX_BINDER_OBJECT_SIZE);
- objsize = io->encode_local_object(dest->data + pos, local);
+ objsize = io->encode_local_object(dest->data + pos,
+ local, proto);
g_byte_array_set_size(dest, pos + objsize);
/* Keep the reference */
data->cleanup = gbinder_cleanup_add(data->cleanup,
(GDestroyNotify) gbinder_local_object_unref, local);
} else {
- objsize = io->object_size(obj);
+ objsize = io->object_size(obj, proto);
g_byte_array_append(dest, obj, objsize);
}
@@ -729,6 +745,135 @@
return 0;
}
+static
+void
+gbinder_writer_append_fields(
+ GBinderWriter* writer,
+ const void* obj,
+ const GBinderWriterField* fields,
+ const GBinderParent* parent) /* Since 1.1.27 */
+{
+ if (fields) {
+ const GBinderWriterField* field = fields;
+ const guint8* base_ptr = obj;
+ GBinderParent parent2;
+
+ parent2.index = parent->index;
+ for (field = fields; field->type || field->write_buf; field++) {
+ const void* field_ptr = base_ptr + field->offset;
+
+ parent2.offset = parent->offset + field->offset;
+ if (field->write_buf) {
+ field->write_buf(writer, field_ptr, field, &parent2);
+ } else {
+ gbinder_writer_append_buffer_object_with_parent(writer,
+ *(void**)field_ptr, field->type->size, &parent2);
+ }
+ }
+ }
+}
+
+/*
+ * Note that gbinder_writer_append_struct doesn't copy the data, it writes
+ * buffer objects pointing to whatever was passed in. The caller must make
+ * sure that those pointers outlive the transaction. That's most commonly
+ * done with by using gbinder_writer_malloc() and friends for allocating
+ * memory for the transaction.
+ */
+void
+gbinder_writer_append_struct(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterType* type,
+ const GBinderParent* parent) /* Since 1.1.27 */
+{
+ if (type) {
+ GBinderParent child;
+
+ child.offset = 0;
+ child.index = gbinder_writer_append_buffer_object_with_parent(writer,
+ ptr, type->size, parent);
+ gbinder_writer_append_fields(writer, ptr, type->fields, &child);
+ } else {
+ /* No type - no fields */
+ gbinder_writer_append_buffer_object_with_parent(writer, ptr, 0, parent);
+ }
+}
+
+/*
+ * Appends top-level vec<type>. Allocates GBinderHidlVec for that, but
+ * unlike gbinder_writer_append_hidl_vec(), doesn't copy the contents
+ * of the vector.
+ */
+void
+gbinder_writer_append_struct_vec(
+ GBinderWriter* writer,
+ const void* ptr,
+ guint count,
+ const GBinderWriterType* type) /* Since 1.1.29 */
+{
+ GBinderHidlVec* vec = gbinder_writer_new0(writer, GBinderHidlVec);
+ GBinderWriterField vec_f[2];
+ GBinderWriterType vec_t;
+
+ memset(vec_f, 0, sizeof(vec_f));
+ vec_f->name = "hidl_vec.data.ptr";
+ vec_f->type = type;
+ vec_f->write_buf = gbinder_writer_field_hidl_vec_write_buf;
+
+ memset(&vec_t, 0, sizeof(vec_t));
+ vec_t.name = "hidl_vec";
+ vec_t.size = sizeof(GBinderHidlVec);
+ vec_t.fields = vec_f;
+
+ vec->owns_buffer = TRUE;
+ vec->data.ptr = ptr;
+ vec->count = count;
+
+ gbinder_writer_append_struct(writer, vec, &vec_t, NULL);
+}
+
+void
+gbinder_writer_field_hidl_vec_write_buf(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterField* field,
+ const GBinderParent* parent) /* Since 1.1.27 */
+{
+ const GBinderHidlVec* vec = ptr;
+ const guint8* buf = vec->data.ptr;
+ const GBinderWriterType* elem_type = field->type;
+
+ if (elem_type) {
+ GBinderParent child;
+ guint i;
+
+ child.index = gbinder_writer_append_buffer_object_with_parent
+ (writer, buf, vec->count * elem_type->size, parent);
+ for (i = 0; i < vec->count; i++) {
+ child.offset = elem_type->size * i;
+ gbinder_writer_append_fields(writer, buf + child.offset,
+ elem_type->fields, &child);
+ }
+ } else {
+ /* Probably a programming error but write an empty buffer anyway */
+ gbinder_writer_append_buffer_object_with_parent(writer, buf, 0, parent);
+ }
+}
+
+void
+gbinder_writer_field_hidl_string_write_buf(
+ GBinderWriter* writer,
+ const void* ptr,
+ const GBinderWriterField* field,
+ const GBinderParent* parent) /* Since 1.1.27 */
+{
+ const GBinderHidlString* str = ptr;
+
+ gbinder_writer_append_buffer_object_with_parent(writer, str->data.str,
+ str->data.str ? (str->len + 1) : 0, parent);
+}
+
guint
gbinder_writer_data_append_buffer_object(
GBinderWriterData* data,
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/src/gbinder_writer_p.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -39,6 +39,7 @@
typedef struct gbinder_writer_data {
const GBinderIo* io;
+ const GBinderRpcProtocol* protocol;
GByteArray* bytes;
GUtilIntArray* offsets;
gsize buffers_size;
@@ -131,6 +132,13 @@
GBINDER_INTERNAL;
void
+gbinder_writer_data_append_parcelable(
+ GBinderWriterData* data,
+ const void* ptr,
+ gsize size)
+ GBINDER_INTERNAL;
+
+void
gbinder_writer_data_append_hidl_vec(
GBinderWriterData* data,
const void* base,
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/ashmem-test/Makefile
^
|
| @@ -1,140 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = ashmem-test
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-bridge/Makefile
^
|
| @@ -1,154 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-bridge
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
-
-#
-# Install
-#
-
-INSTALL = install
-
-INSTALL_BIN_DIR = $(DESTDIR)/usr/bin
-
-install: release $(INSTALL_BIN_DIR)
- $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR)
-
-$(INSTALL_BIN_DIR):
- $(INSTALL) -d $@
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-call/Makefile
^
|
| @@ -49,10 +49,9 @@
LD = $(CC)
WARNINGS = -Wall
INCLUDES = -I$(LIB_DIR)/include -I$(GEN_DIR) -I$(SRC_DIR)
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
+CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
$(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
+LDFLAGS += -pie $(shell pkg-config --libs $(PKGS))
QUIET_MAKE = make --no-print-directory
DEBUG_FLAGS = -g
RELEASE_FLAGS =
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-call/binder-call.c
^
|
| @@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
+ * Copyright (C) 2021-2022 Jolla Ltd.
* Copyright (C) 2021 Franz-Josef Haider <franz.haider@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
@@ -80,9 +80,11 @@
switch(v->type) {
case INT8_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("int8");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("int8 %u", (guint)(*((guint8*)v->value)));
+ }
if (parent_idx == -1) {
- gbinder_writer_append_int32(&app->writer, *((int*)v->value));
+ gbinder_writer_append_int8(&app->writer, *((guint8*)v->value));
} else if (cur_pass == FILL_BUFFERS) {
*((unsigned char*)(((char*)buf)+offset)) =
*((unsigned char*)v->value);
@@ -91,7 +93,9 @@
break;
case INT32_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("int32");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("int32 %d", *((int*)v->value));
+ }
if (parent_idx == -1) {
gbinder_writer_append_int32(&app->writer, *((int*)v->value));
} else if (cur_pass == FILL_BUFFERS) {
@@ -101,7 +105,9 @@
break;
case INT64_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("int64");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("int64 %" G_GINT64_MODIFIER "d", *((gint64*)v->value));
+ }
if (parent_idx == -1) {
gbinder_writer_append_int64(&app->writer, *((gint64*)v->value));
} else if (cur_pass == FILL_BUFFERS) {
@@ -111,7 +117,9 @@
break;
case FLOAT_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("float");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("float %g", (double)*((float*)v->value));
+ }
if (parent_idx == -1) {
gbinder_writer_append_float(&app->writer, *((float*)v->value));
} else if (cur_pass == FILL_BUFFERS) {
@@ -120,7 +128,9 @@
offset += sizeof(float);
break;
case DOUBLE_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("double");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("double %g", *((double*)v->value));
+ }
if (parent_idx == -1) {
gbinder_writer_append_double(&app->writer,*((double*)v->value));
} else if (cur_pass == FILL_BUFFERS) {
@@ -130,7 +140,9 @@
break;
case STRING8_TYPE:
- if (cur_pass == BUILD_TRANSACTION) GDEBUG("string8");
+ if (cur_pass == BUILD_TRANSACTION) {
+ GDEBUG("string8 %s", (char*)v->value);
+ }
gbinder_writer_append_string8(&app->writer, v->value);
/* offset not incremented since it only makes sense for hidl */
break;
@@ -579,7 +591,7 @@
App* app)
{
const AppOptions* opt = app->opt;
- char* iface = opt->iface ? g_strdup(opt->iface) : NULL;
+ char* iface;
int status = 0;
int rargc = 1;
char* service = opt->argv[rargc++];
@@ -598,7 +610,6 @@
service, &status);
if (!obj) {
GERR("No such service: %s", service);
- g_free(iface);
return;
}
@@ -764,14 +775,34 @@
gutil_log_default.level = GLOG_LEVEL_DEFAULT;
if (g_option_context_parse(options, &argc, &argv, &error)) {
- char* help;
+ int i;
+ /*
+ * Remove the "--" argument. If any of our arguments is a negative
+ * number, the user will have to add the "--" flag to stop the parser.
+ * But "--" is still passed to us and we have to ignore it.
+ */
+ for (i = 1; i < argc; i++) {
+ if (!strcmp(argv[i], "--")) {
+ if (i < (argc - 1)) {
+ memmove(argv + i, argv + (i + 1),
+ sizeof(char*) * (argc - i - 1));
+ }
+ i--;
+ argc--;
+
+ /*
+ * There's no need to have more than one "--", but let's
+ * remove any number of those.
+ */
+ }
+ }
if (argc > 2) {
opt->argc = argc;
opt->argv = argv;
ok = TRUE;
} else {
- help = g_option_context_get_help(options, TRUE, NULL);
+ char* help = g_option_context_get_help(options, TRUE, NULL);
fprintf(stderr, "%s", help);
g_free(help);
}
@@ -800,7 +831,6 @@
GERR("servicemanager seems to be missing");
}
}
- g_free(opt.iface);
g_free(opt.dev);
return app.ret;
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-call/binder-call.h
^
|
| @@ -1,5 +1,5 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
+ * Copyright (C) 2021-2022 Jolla Ltd.
*
* You may use this file under the terms of BSD license as follows:
*
@@ -36,7 +36,6 @@
typedef struct app_options {
char* dev;
- char* iface;
gboolean oneway;
gboolean aidl;
gint transaction;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-call/cmdline.l
^
|
| @@ -55,11 +55,11 @@
"}" { return('}'); }
"[" { return('['); }
"]" { return(']'); }
-{D}*{INT8_SUFFIX} { cmdlinelval.int8_value = atoi(yytext); return(INT8_VALUE); }
-{D}*{INT64_SUFFIX} { cmdlinelval.int64_value = atol(yytext); return(INT64_VALUE); }
-{D}* { cmdlinelval.int32_value = atoi(yytext); return(INT32_VALUE); }
-{D}+"."{D}*{INT64_SUFFIX} { cmdlinelval.double_value = atof(yytext); return(DOUBLE_VALUE); }
-{D}+"."{D}* { cmdlinelval.float_value = atof(yytext); return(FLOAT_VALUE); }
+-?{D}+{INT8_SUFFIX} { cmdlinelval.int8_value = atoi(yytext); return(INT8_VALUE); }
+-?{D}+{INT64_SUFFIX} { cmdlinelval.int64_value = atol(yytext); return(INT64_VALUE); }
+-?{D}+ { cmdlinelval.int32_value = atoi(yytext); return(INT32_VALUE); }
+-?{D}+"."{D}*{INT64_SUFFIX} { cmdlinelval.double_value = atof(yytext); return(DOUBLE_VALUE); }
+-?{D}+"."{D}* { cmdlinelval.float_value = atof(yytext); return(FLOAT_VALUE); }
"reply" { return(REPLY); }
\".*\"{HSTRING_SUFFIX} { cmdlinelval.hstring_value = handle_str(yytext); return(HSTRING_VALUE); }
\".*\"{UTF16_SUFFIX} { cmdlinelval.string16_value = handle_str(yytext); return(STRING16_VALUE); }
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-client/Makefile
^
|
| @@ -1,140 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-client
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-dump/Makefile
^
|
| @@ -1,140 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-dump
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-dump/binder-dump.c
^
|
| @@ -171,6 +171,8 @@
app_log_verbose, "Enable verbose output", NULL },
{ "quiet", 'q', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
app_log_quiet, "Be quiet", NULL },
+ { "device", 'd', 0, G_OPTION_ARG_STRING, &opt->dev,
+ "Binder device [" DEV_DEFAULT "]", "DEVICE" },
{ NULL }
};
@@ -187,7 +189,7 @@
if (g_option_context_parse(options, &argc, &argv, &error)) {
char* help;
- opt->dev = g_strdup(DEV_DEFAULT);
+ if (!opt->dev || !opt->dev[0]) opt->dev = g_strdup(DEV_DEFAULT);
switch (argc) {
case 2:
opt->service = argv[1];
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-list/Makefile
^
|
| @@ -1,154 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-list
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
-
-#
-# Install
-#
-
-INSTALL = install
-
-INSTALL_BIN_DIR = $(DESTDIR)/usr/bin
-
-install: release $(INSTALL_BIN_DIR)
- $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR)
-
-$(INSTALL_BIN_DIR):
- $(INSTALL) -d $@
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-ping/Makefile
^
|
| @@ -1,154 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-ping
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
-
-#
-# Install
-#
-
-INSTALL = install
-
-INSTALL_BIN_DIR = $(DESTDIR)/usr/bin
-
-install: release $(INSTALL_BIN_DIR)
- $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR)
-
-$(INSTALL_BIN_DIR):
- $(INSTALL) -d $@
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/binder-service/Makefile
^
|
| @@ -1,140 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = binder-service
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+include ../common/Makefile
|
|
[-]
[+]
|
Added |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/common/Makefile
^
|
| @@ -0,0 +1,152 @@
+# -*- Mode: makefile-gmake -*-
+
+.PHONY: all debug release install clean cleaner
+.PHONY: libgbinder-release libgbinder-debug
+
+#
+# Executable must be defined
+#
+
+ifndef EXE
+${error EXE not defined}
+endif
+
+#
+# Required packages
+#
+
+PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
+
+#
+# Default target
+#
+
+all: debug release
+
+#
+# Sources
+#
+
+SRC ?= $(EXE).c
+
+#
+# Directories
+#
+
+SRC_DIR = .
+BUILD_DIR = build
+LIB_DIR = ../..
+DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
+RELEASE_BUILD_DIR = $(BUILD_DIR)/release
+
+#
+# Tools and flags
+#
+
+CC ?= $(CROSS_COMPILE)gcc
+LD = $(CC)
+WARNINGS = -Wall
+INCLUDES = -I$(LIB_DIR)/include
+CFLAGS += -fPIC $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
+ $(shell pkg-config --cflags $(PKGS))
+LDFLAGS += -pie $(shell pkg-config --libs $(PKGS))
+QUIET_MAKE = make --no-print-directory
+DEBUG_FLAGS = -g
+RELEASE_FLAGS =
+
+KEEP_SYMBOLS ?= 0
+ifneq ($(KEEP_SYMBOLS),0)
+RELEASE_FLAGS += -g
+SUBMAKE_OPTS += KEEP_SYMBOLS=1
+endif
+
+DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
+RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
+DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
+RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
+
+#
+# Files
+#
+
+DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
+RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
+DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
+RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
+DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
+RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
+DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
+RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
+
+#
+# Dependencies
+#
+
+DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(DEPS)),)
+-include $(DEPS)
+endif
+endif
+
+$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
+$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
+
+#
+# Rules
+#
+
+DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
+RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
+
+debug: libgbinder-debug $(DEBUG_EXE)
+
+release: libgbinder-release $(RELEASE_EXE)
+
+clean:
+ rm -f *~
+ rm -fr $(BUILD_DIR)
+
+cleaner: clean
+ @make -C $(LIB_DIR) clean
+
+$(DEBUG_BUILD_DIR):
+ mkdir -p $@
+
+$(RELEASE_BUILD_DIR):
+ mkdir -p $@
+
+$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
+ $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
+
+$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
+ $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
+
+$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
+ $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
+
+$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
+ $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
+ifeq ($(KEEP_SYMBOLS),0)
+ strip $@
+endif
+
+libgbinder-debug:
+ @$(MAKE) $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
+
+libgbinder-release:
+ @$(MAKE) $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+
+#
+# Install
+#
+
+INSTALL = install
+
+INSTALL_BIN_DIR = $(DESTDIR)/usr/bin
+
+install: release $(INSTALL_BIN_DIR)
+ $(INSTALL) -m 755 $(RELEASE_EXE) $(INSTALL_BIN_DIR)
+
+$(INSTALL_BIN_DIR):
+ $(INSTALL) -d $@
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/test/rild-card-status/Makefile
^
|
| @@ -1,140 +1,5 @@
# -*- Mode: makefile-gmake -*-
-.PHONY: all debug release clean cleaner
-.PHONY: libgbinder-release libgbinder-debug
-
-#
-# Required packages
-#
-
-PKGS = glib-2.0 gio-2.0 gio-unix-2.0 libglibutil
-
-#
-# Default target
-#
-
-all: debug release
-
-#
-# Executable
-#
-
EXE = rild-card-status
-#
-# Sources
-#
-
-SRC = $(EXE).c
-
-#
-# Directories
-#
-
-SRC_DIR = .
-BUILD_DIR = build
-LIB_DIR = ../..
-DEBUG_BUILD_DIR = $(BUILD_DIR)/debug
-RELEASE_BUILD_DIR = $(BUILD_DIR)/release
-
-#
-# Tools and flags
-#
-
-CC ?= $(CROSS_COMPILE)gcc
-LD = $(CC)
-WARNINGS = -Wall
-INCLUDES = -I$(LIB_DIR)/include
-BASE_FLAGS = -fPIC
-CFLAGS = $(BASE_FLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) -MMD -MP \
- $(shell pkg-config --cflags $(PKGS))
-LDFLAGS = $(BASE_FLAGS) $(shell pkg-config --libs $(PKGS))
-QUIET_MAKE = make --no-print-directory
-DEBUG_FLAGS = -g
-RELEASE_FLAGS =
-
-ifndef KEEP_SYMBOLS
-KEEP_SYMBOLS = 0
-endif
-
-ifneq ($(KEEP_SYMBOLS),0)
-RELEASE_FLAGS += -g
-SUBMAKE_OPTS += KEEP_SYMBOLS=1
-endif
-
-DEBUG_LDFLAGS = $(LDFLAGS) $(DEBUG_FLAGS)
-RELEASE_LDFLAGS = $(LDFLAGS) $(RELEASE_FLAGS)
-DEBUG_CFLAGS = $(CFLAGS) $(DEBUG_FLAGS) -DDEBUG
-RELEASE_CFLAGS = $(CFLAGS) $(RELEASE_FLAGS) -O2
-
-#
-# Files
-#
-
-DEBUG_OBJS = $(SRC:%.c=$(DEBUG_BUILD_DIR)/%.o)
-RELEASE_OBJS = $(SRC:%.c=$(RELEASE_BUILD_DIR)/%.o)
-DEBUG_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_so)
-RELEASE_SO_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_so)
-DEBUG_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_debug_link)
-RELEASE_LINK_FILE := $(shell $(QUIET_MAKE) -C $(LIB_DIR) print_release_link)
-DEBUG_SO = $(LIB_DIR)/$(DEBUG_SO_FILE)
-RELEASE_SO = $(LIB_DIR)/$(RELEASE_SO_FILE)
-
-#
-# Dependencies
-#
-
-DEPS = $(DEBUG_OBJS:%.o=%.d) $(RELEASE_OBJS:%.o=%.d)
-ifneq ($(MAKECMDGOALS),clean)
-ifneq ($(strip $(DEPS)),)
--include $(DEPS)
-endif
-endif
-
-$(DEBUG_OBJS): | $(DEBUG_BUILD_DIR)
-$(RELEASE_OBJS): | $(RELEASE_BUILD_DIR)
-
-#
-# Rules
-#
-
-DEBUG_EXE = $(DEBUG_BUILD_DIR)/$(EXE)
-RELEASE_EXE = $(RELEASE_BUILD_DIR)/$(EXE)
-
-debug: libgbinder-debug $(DEBUG_EXE)
-
-release: libgbinder-release $(RELEASE_EXE)
-
-clean:
- rm -f *~
- rm -fr $(BUILD_DIR)
-
-cleaner: clean
- @make -C $(LIB_DIR) clean
-
-$(DEBUG_BUILD_DIR):
- mkdir -p $@
-
-$(RELEASE_BUILD_DIR):
- mkdir -p $@
-
-$(DEBUG_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(DEBUG_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(RELEASE_BUILD_DIR)/%.o : $(SRC_DIR)/%.c
- $(CC) -c $(RELEASE_CFLAGS) -MT"$@" -MF"$(@:%.o=%.d)" $< -o $@
-
-$(DEBUG_EXE): $(DEBUG_SO) $(DEBUG_BUILD_DIR) $(DEBUG_OBJS)
- $(LD) $(DEBUG_OBJS) $(DEBUG_LDFLAGS) $< -o $@
-
-$(RELEASE_EXE): $(RELEASE_SO) $(RELEASE_BUILD_DIR) $(RELEASE_OBJS)
- $(LD) $(RELEASE_OBJS) $(RELEASE_LDFLAGS) $< -o $@
-ifeq ($(KEEP_SYMBOLS),0)
- strip $@
-endif
-
-libgbinder-debug:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(DEBUG_SO_FILE) $(DEBUG_LINK_FILE)
-
-libgbinder-release:
- @make $(SUBMAKE_OPTS) -C $(LIB_DIR) $(RELEASE_SO_FILE) $(RELEASE_LINK_FILE)
+include ../common/Makefile
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/Makefile
^
|
| @@ -25,6 +25,7 @@
@$(MAKE) -C unit_servicemanager_aidl $*
@$(MAKE) -C unit_servicemanager_aidl2 $*
@$(MAKE) -C unit_servicemanager_aidl3 $*
+ @$(MAKE) -C unit_servicemanager_aidl4 $*
@$(MAKE) -C unit_servicemanager_hidl $*
@$(MAKE) -C unit_servicename $*
@$(MAKE) -C unit_servicepoll $*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/common/test_binder.c
^
|
| @@ -69,11 +69,6 @@
#define BINDER_SET_MAX_THREADS _IOW('b', 5, guint32)
#define BINDER_BUFFER_FLAG_HAS_PARENT 0x01
-#define B_TYPE_LARGE 0x85
-#define BINDER_TYPE_BINDER GBINDER_FOURCC('s', 'b', '*', B_TYPE_LARGE)
-#define BINDER_TYPE_HANDLE GBINDER_FOURCC('s', 'h', '*', B_TYPE_LARGE)
-#define BINDER_TYPE_PTR GBINDER_FOURCC('p', 't', '*', B_TYPE_LARGE)
-
#define TF_ONE_WAY 0x01
#define TF_ROOT_OBJECT 0x04
#define TF_STATUS_CODE 0x08
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/common/test_binder.h
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -35,6 +35,16 @@
#include "test_common.h"
+#define B_TYPE_LARGE 0x85
+#define BINDER_TYPE_BINDER GBINDER_FOURCC('s', 'b', '*', B_TYPE_LARGE)
+#define BINDER_TYPE_HANDLE GBINDER_FOURCC('s', 'h', '*', B_TYPE_LARGE)
+#define BINDER_TYPE_PTR GBINDER_FOURCC('p', 't', '*', B_TYPE_LARGE)
+
+#define BUFFER_OBJECT_SIZE_32 (24)
+#define BUFFER_OBJECT_SIZE_64 (40)
+#define BINDER_OBJECT_SIZE_32 (16)
+#define BINDER_OBJECT_SIZE_64 (24)
+
typedef struct test_binder TestBinder;
void
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/coverage/run
^
|
| @@ -27,6 +27,7 @@
unit_servicemanager_aidl \
unit_servicemanager_aidl2 \
unit_servicemanager_aidl3 \
+unit_servicemanager_aidl4 \
unit_servicemanager_hidl \
unit_servicename \
unit_servicepoll \
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_bridge/unit_bridge.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
- * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021-2022 Jolla Ltd.
+ * Copyright (C) 2021-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -183,7 +183,7 @@
test_servicemanager_impl_new(
const char* dev)
{
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
TestServiceManagerHidl* sm = test_servicemanager_hidl_new(ipc);
@@ -357,10 +357,10 @@
test.loop = g_main_loop_new(NULL, FALSE);
/* obj (DEST) <=> bridge <=> (SRC) mirror */
- src_ipc = gbinder_ipc_new(SRC_DEV);
- src_priv_ipc = gbinder_ipc_new(SRC_PRIV_DEV);
- dest_ipc = gbinder_ipc_new(DEST_DEV);
- dest_priv_ipc = gbinder_ipc_new(DEST_PRIV_DEV);
+ src_ipc = gbinder_ipc_new(SRC_DEV, NULL);
+ src_priv_ipc = gbinder_ipc_new(SRC_PRIV_DEV, NULL);
+ dest_ipc = gbinder_ipc_new(DEST_DEV, NULL);
+ dest_priv_ipc = gbinder_ipc_new(DEST_PRIV_DEV, NULL);
test.src_impl = test_servicemanager_impl_new(SRC_PRIV_DEV);
dest_impl = test_servicemanager_impl_new(DEST_PRIV_DEV);
src_fd = gbinder_driver_fd(src_ipc->driver);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_client/unit_client.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -55,7 +55,7 @@
guint h,
const char* iface)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteObject* obj = gbinder_object_registry_get_remote(reg, h, TRUE);
GBinderClient* client = gbinder_client_new(obj, iface);
@@ -99,7 +99,7 @@
test_basic(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteObject* obj = gbinder_object_registry_get_remote(reg, 0, TRUE);
const char* iface = "foo";
@@ -125,7 +125,7 @@
test_interfaces(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteObject* obj = gbinder_object_registry_get_remote(reg, 0, TRUE);
static const GBinderClientIfaceInfo ifaces[] = {
@@ -277,7 +277,8 @@
GBinderDriver* driver = gbinder_client_ipc(client)->driver;
int fd = gbinder_driver_fd(driver);
const GBinderIo* io = gbinder_driver_io(driver);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ const GBinderRpcProtocol* protocol = gbinder_driver_protocol(driver);
+ GBinderLocalReply* reply = gbinder_local_reply_new(io, protocol);
GBinderRemoteReply* tx_reply;
GBinderOutputData* data;
const guint32 handle = 0;
@@ -380,7 +381,8 @@
GBinderDriver* driver = gbinder_client_ipc(client)->driver;
int fd = gbinder_driver_fd(driver);
const GBinderIo* io = gbinder_driver_io(driver);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ const GBinderRpcProtocol* protocol = gbinder_driver_protocol(driver);
+ GBinderLocalReply* reply = gbinder_local_reply_new(io, protocol);
GBinderOutputData* data;
const guint32 handle = 0;
const guint32 code = 1;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_config/unit_config.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2020 Jolla Ltd.
- * Copyright (C) 2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -231,6 +231,7 @@
char* file1 = g_build_filename(subdir, "a.conf", NULL);
char* file2 = g_build_filename(subdir, "b.conf", NULL);
char* file3 = g_build_filename(subdir, "c.conf", NULL);
+ char* file4 = g_build_filename(subdir, "d.conf", NULL);
char* random_file = g_build_filename(subdir, "foo", NULL);
static const char garbage[] = "foo";
static const char config[] =
@@ -252,6 +253,11 @@
"/dev/binder3 = aidl3\n"
"[ServiceManager]\n"
"/dev/binder3 = aidl3\n";
+ static const char config4[] =
+ "[Protocol]\n"
+ "/dev/binder4 = aidl3\n"
+ "[ServiceManager]\n"
+ "/dev/binder4 = aidl4\n";
g_assert_cmpint(mkdir(subdir, 0700), == ,0);
g_assert_cmpint(mkdir(notafile, 0700), == ,0);
@@ -259,6 +265,7 @@
g_assert(g_file_set_contents(file1, config1, -1, NULL));
g_assert(g_file_set_contents(file2, config2, -1, NULL));
g_assert(g_file_set_contents(file3, config3, -1, NULL));
+ g_assert(g_file_set_contents(file4, config4, -1, NULL));
g_assert(g_file_set_contents(random_file, garbage, -1, NULL));
/* Reset the state */
@@ -271,10 +278,12 @@
g_assert(k);
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2");
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3");
+ g_assert_cmpstr(test_value(k,"Protocol","/dev/binder4",b), == ,"aidl3");
g_assert_cmpstr(test_value(k,"Protocol","/dev/hbinder",b), == ,"hidl");
g_assert_cmpstr(test_value(k,"Protocol","/dev/hwbinder",b), == ,"hidl");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3");
+ g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder4",b),==,"aidl4");
/* Remove the default file and try again */
gbinder_config_exit();
@@ -284,9 +293,11 @@
g_assert(!test_value(k,"Protocol","/dev/hbinder",b));
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2");
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3");
+ g_assert_cmpstr(test_value(k,"Protocol","/dev/binder4",b), == ,"aidl3");
g_assert_cmpstr(test_value(k,"Protocol","/dev/hwbinder",b), == ,"hidl");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3");
+ g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder4",b),==,"aidl4");
/* Damage one of the files and try again */
gbinder_config_exit();
@@ -297,8 +308,10 @@
g_assert(!test_value(k,"Protocol","/dev/hwbinder",b));
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2");
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3");
+ g_assert_cmpstr(test_value(k,"Protocol","/dev/binder4",b), == ,"aidl3");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3");
+ g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder4",b),==,"aidl4");
/* Disallow access to one of the files and try again */
gbinder_config_exit();
@@ -309,14 +322,27 @@
g_assert(!test_value(k,"Protocol","/dev/hwbinder",b));
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder",b), == ,"aidl2");
g_assert_cmpstr(test_value(k,"Protocol","/dev/binder3",b), == ,"aidl3");
+ g_assert_cmpstr(test_value(k,"Protocol","/dev/binder4",b), == ,"aidl3");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder",b),==,"aidl2");
g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder3",b),==,"aidl3");
+ g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder4",b),==,"aidl4");
- /* Delete the remaining files and try again */
+ /* Leave only one file (file4) in the subdirectory */
gbinder_config_exit();
g_assert_cmpint(remove(file1), == ,0);
g_assert_cmpint(remove(file2), == ,0);
g_assert_cmpint(remove(file3), == ,0);
+ k = gbinder_config_get();
+ g_assert(k);
+ g_assert(!test_value(k,"Protocol","/dev/hbinder",b));
+ g_assert(!test_value(k,"Protocol","/dev/hwbinder",b));
+ g_assert(!test_value(k,"Protocol","/dev/binder3",b));
+ g_assert_cmpstr(test_value(k,"Protocol","/dev/binder4",b),==,"aidl3");
+ g_assert_cmpstr(test_value(k,"ServiceManager","/dev/binder4",b),==,"aidl4");
+
+ /* Delete the remaining file and try again */
+ gbinder_config_exit();
+ g_assert_cmpint(remove(file4), == ,0);
g_assert(!gbinder_config_get());
/* Undo all the damage */
@@ -329,6 +355,7 @@
g_free(file1);
g_free(file2);
g_free(file3);
+ g_free(file4);
g_free(random_file);
remove(notafile);
@@ -495,6 +522,20 @@
"[ServiceManager]\n"
"/dev/binder = aidl3\n"
"/dev/vndbinder = aidl3\n"
+ },{
+ "31",
+
+ "[General]\n"
+ "ApiLevel = 31",
+
+ "[General]\n"
+ "ApiLevel = 31\n"
+ "[Protocol]\n"
+ "/dev/binder = aidl3\n"
+ "/dev/vndbinder = aidl3\n"
+ "[ServiceManager]\n"
+ "/dev/binder = aidl4\n"
+ "/dev/vndbinder = aidl4\n"
}
};
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_driver/unit_driver.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -32,6 +32,7 @@
#include "test_binder.h"
+#include "gbinder_config.h"
#include "gbinder_driver.h"
#include "gbinder_handler.h"
#include "gbinder_local_request_p.h"
@@ -140,12 +141,31 @@
int main(int argc, char* argv[])
{
+ const char* default_config_dir;
+ const char* default_config_file;
+ char* config_dir = g_dir_make_tmp("gbinder-test-driver-XXXXXX", NULL);
+ char* config_file = g_build_filename(config_dir, "test.conf", NULL);
+ int result;
+
+ /* Point gbinder_config_file to a non-existent file */
+ default_config_dir = gbinder_config_dir;
+ default_config_file = gbinder_config_file;
+ gbinder_config_dir = config_dir;
+ gbinder_config_file = config_file;
+
g_test_init(&argc, &argv, NULL);
g_test_add_func(TEST_PREFIX "basic", test_basic);
g_test_add_func(TEST_PREFIX "noop", test_noop);
g_test_add_func(TEST_PREFIX "local_request", test_local_request);
test_init(&test_opt, argc, argv);
- return g_test_run();
+ result = g_test_run();
+
+ gbinder_config_dir = default_config_dir;
+ gbinder_config_file = default_config_file;
+ remove(config_dir);
+ g_free(config_dir);
+ g_free(config_file);
+ return result;
}
/*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_ipc/unit_ipc.c
^
|
| @@ -70,6 +70,24 @@
test_quit_later((GMainLoop*)loop);
}
+static
+GBinderLocalRequest*
+test_local_request_new(
+ GBinderIpc* ipc)
+{
+ return gbinder_local_request_new(gbinder_driver_io(ipc->driver),
+ gbinder_driver_protocol(ipc->driver), NULL);
+}
+
+static
+GBinderLocalReply*
+test_local_reply_new(
+ GBinderIpc* ipc)
+{
+ return gbinder_local_reply_new(gbinder_driver_io(ipc->driver),
+ gbinder_driver_protocol(ipc->driver));
+}
+
/*==========================================================================*
* null
*==========================================================================*/
@@ -79,26 +97,25 @@
test_null(
void)
{
- GBinderIpc* null = NULL;
int status = INT_MAX;
- g_assert(!gbinder_ipc_ref(null));
- gbinder_ipc_unref(null);
- g_assert(!gbinder_ipc_sync_main.sync_reply(null, 0, 0, NULL, NULL));
- g_assert(!gbinder_ipc_sync_main.sync_reply(null, 0, 0, NULL, &status));
+ g_assert(!gbinder_ipc_ref(NULL));
+ gbinder_ipc_unref(NULL);
+ g_assert(!gbinder_ipc_sync_main.sync_reply(NULL, 0, 0, NULL, NULL));
+ g_assert(!gbinder_ipc_sync_main.sync_reply(NULL, 0, 0, NULL, &status));
g_assert_cmpint(status, == ,-EINVAL);
- g_assert(!gbinder_ipc_sync_worker.sync_reply(null, 0, 0, NULL, NULL));
- g_assert(!gbinder_ipc_sync_worker.sync_reply(null, 0, 0, NULL, &status));
+ g_assert(!gbinder_ipc_sync_worker.sync_reply(NULL, 0, 0, NULL, NULL));
+ g_assert(!gbinder_ipc_sync_worker.sync_reply(NULL, 0, 0, NULL, &status));
g_assert_cmpint(status, == ,-EINVAL);
- g_assert_cmpint(gbinder_ipc_sync_main.sync_oneway(null, 0, 0, NULL), == ,
+ g_assert_cmpint(gbinder_ipc_sync_main.sync_oneway(NULL, 0, 0, NULL), == ,
-EINVAL);
- g_assert_cmpint(gbinder_ipc_sync_worker.sync_oneway(null, 0, 0, NULL), == ,
+ g_assert_cmpint(gbinder_ipc_sync_worker.sync_oneway(NULL, 0, 0, NULL), == ,
-EINVAL);
- g_assert(!gbinder_ipc_transact(null, 0, 0, 0, NULL, NULL, NULL, NULL));
- g_assert(!gbinder_ipc_transact_custom(null, NULL, NULL, NULL, NULL));
- g_assert(!gbinder_ipc_object_registry(null));
- gbinder_ipc_looper_check(null);
- gbinder_ipc_cancel(null, 0);
+ g_assert(!gbinder_ipc_transact(NULL, 0, 0, 0, NULL, NULL, NULL, NULL));
+ g_assert(!gbinder_ipc_transact_custom(NULL, NULL, NULL, NULL, NULL));
+ g_assert(!gbinder_ipc_object_registry(NULL));
+ gbinder_ipc_looper_check(NULL);
+ gbinder_ipc_cancel(NULL, 0);
g_assert(!gbinder_object_registry_ref(NULL));
gbinder_object_registry_unref(NULL);
@@ -134,8 +151,8 @@
test_basic(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- GBinderIpc* ipc2 = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderIpc* ipc2 = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderLocalObject* obj;
g_assert(ipc);
@@ -154,14 +171,37 @@
gbinder_local_object_unref(obj);
/* Second gbinder_ipc_new returns the same (default) object */
- g_assert(gbinder_ipc_new(NULL) == ipc);
- g_assert(gbinder_ipc_new("") == ipc);
+ g_assert(gbinder_ipc_new(NULL, NULL) == ipc);
+ g_assert(gbinder_ipc_new("", NULL) == ipc);
gbinder_ipc_unref(ipc);
gbinder_ipc_unref(ipc);
gbinder_ipc_unref(ipc);
/* Invalid path */
- g_assert(!gbinder_ipc_new("invalid path"));
+ g_assert(!gbinder_ipc_new("invalid path", NULL));
+
+ gbinder_ipc_exit();
+ test_binder_exit_wait(&test_opt, NULL);
+}
+
+/*==========================================================================*
+ * protocol
+ *==========================================================================*/
+
+static
+void
+test_protocol(
+ void)
+{
+ /* GBinderIpc objects are identified by device + protocol combination */
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, "aidl");
+ GBinderIpc* ipc2 = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, "hidl");
+
+ g_assert(ipc);
+ g_assert(ipc2);
+ g_assert(ipc != ipc2);
+ gbinder_ipc_unref(ipc);
+ gbinder_ipc_unref(ipc2);
gbinder_ipc_exit();
test_binder_exit_wait(&test_opt, NULL);
@@ -189,10 +229,9 @@
test_async_oneway(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderLocalRequest* req = test_local_request_new(ipc);
const int fd = gbinder_driver_fd(ipc->driver);
- GBinderLocalRequest* req = gbinder_local_request_new(io, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
gulong id;
@@ -216,10 +255,9 @@
test_sync_oneway(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderLocalRequest* req = test_local_request_new(ipc);
const int fd = gbinder_driver_fd(ipc->driver);
- GBinderLocalRequest* req = gbinder_local_request_new(io, NULL);
test_binder_br_transaction_complete(fd);
g_assert_cmpint(gbinder_ipc_sync_main.sync_oneway(ipc, 0, 1, req), == ,0);
@@ -238,13 +276,12 @@
test_sync_reply_ok_status(
int* status)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
- const int fd = gbinder_driver_fd(ipc->driver);
- GBinderLocalRequest* req = gbinder_local_request_new(io, NULL);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderLocalRequest* req = test_local_request_new(ipc);
+ GBinderLocalReply* reply = test_local_reply_new(ipc);
GBinderRemoteReply* tx_reply;
GBinderOutputData* data;
+ const int fd = gbinder_driver_fd(ipc->driver);
const guint32 handle = 0;
const guint32 code = 1;
const char* result_in = "foo";
@@ -295,10 +332,9 @@
test_sync_reply_error(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderLocalRequest* req = test_local_request_new(ipc);
const int fd = gbinder_driver_fd(ipc->driver);
- GBinderLocalRequest* req = gbinder_local_request_new(io, NULL);
const guint32 handle = 0;
const guint32 code = 1;
const gint expected_status = (-EINVAL);
@@ -364,14 +400,13 @@
test_transact_ok(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
- const int fd = gbinder_driver_fd(ipc->driver);
- GBinderLocalRequest* req = gbinder_local_request_new(io, NULL);
- GBinderLocalReply* reply = gbinder_local_reply_new(io);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderLocalRequest* req = test_local_request_new(ipc);
+ GBinderLocalReply* reply = test_local_reply_new(ipc);
GBinderOutputData* data;
const guint32 handle = 0;
const guint32 code = 1;
+ const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
gulong id;
@@ -423,10 +458,9 @@
test_transact_dead(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
- const GBinderIo* io = gbinder_driver_io(ipc->driver);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_local_object/unit_local_object.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -33,6 +33,7 @@
#include "test_binder.h"
#include "gbinder_buffer_p.h"
+#include "gbinder_config.h"
#include "gbinder_driver.h"
#include "gbinder_ipc.h"
#include "gbinder_local_object_p.h"
@@ -152,7 +153,7 @@
{
const char* const ifaces_foo[] = { "foo", NULL };
const char* const ifaces_bar[] = { "bar", NULL };
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderLocalObject* foo;
GBinderLocalObject* bar;
@@ -201,7 +202,7 @@
int status = INT_MAX;
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
@@ -247,7 +248,7 @@
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
const char* const ifaces[] = { "x", NULL };
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, ifaces, NULL, NULL);
@@ -296,7 +297,7 @@
int status = INT_MAX;
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
@@ -346,7 +347,7 @@
int status = INT_MAX;
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
@@ -402,7 +403,7 @@
const char* dev = GBINDER_DEFAULT_HWBINDER;
const char* const ifaces[] = { "android.hidl.base@1.0::IBase", NULL };
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, ifaces, NULL, NULL);
@@ -476,7 +477,7 @@
int count = 0, status = INT_MAX;
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, ifaces,
@@ -583,7 +584,7 @@
int count = 0, status = 0;
const char* dev = GBINDER_DEFAULT_HWBINDER;
const GBinderRpcProtocol* prot = gbinder_rpc_protocol_for_device(dev);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteRequest* req = gbinder_remote_request_new(reg, prot, 0, 0);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, ifaces,
@@ -624,7 +625,7 @@
test_increfs_run(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderLocalObject* obj = gbinder_local_object_new
(ipc, NULL, NULL, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
@@ -675,7 +676,7 @@
test_decrefs_run(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderLocalObject* obj = gbinder_local_object_new
(ipc, NULL, NULL, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
@@ -726,7 +727,7 @@
test_acquire_run(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderLocalObject* obj = gbinder_local_object_new
(ipc, NULL, NULL, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
@@ -777,7 +778,7 @@
test_release_run(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
int fd = gbinder_driver_fd(ipc->driver);
@@ -815,6 +816,18 @@
int main(int argc, char* argv[])
{
+ const char* default_config_dir;
+ const char* default_config_file;
+ char* config_dir = g_dir_make_tmp("gbinder-test-local-object-XXXXXX", NULL);
+ char* config_file = g_build_filename(config_dir, "test.conf", NULL);
+ int result;
+
+ /* Point gbinder_config_file to a non-existent file */
+ default_config_dir = gbinder_config_dir;
+ default_config_file = gbinder_config_file;
+ gbinder_config_dir = config_dir;
+ gbinder_config_file = config_file;
+
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
g_type_init();
G_GNUC_END_IGNORE_DEPRECATIONS;
@@ -833,7 +846,14 @@
g_test_add_func(TEST_PREFIX "acquire", test_acquire);
g_test_add_func(TEST_PREFIX "release", test_release);
test_init(&test_opt, argc, argv);
- return g_test_run();
+ result = g_test_run();
+
+ gbinder_config_dir = default_config_dir;
+ gbinder_config_file = default_config_file;
+ remove(config_dir);
+ g_free(config_dir);
+ g_free(config_file);
+ return result;
}
/*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_local_reply/unit_local_reply.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -36,6 +36,7 @@
#include "gbinder_local_object.h"
#include "gbinder_local_reply_p.h"
#include "gbinder_output_data.h"
+#include "gbinder_rpc_protocol.h"
#include "gbinder_buffer_p.h"
#include "gbinder_driver.h"
#include "gbinder_writer.h"
@@ -46,11 +47,6 @@
static TestOpt test_opt;
-#define BUFFER_OBJECT_SIZE_32 (24)
-#define BUFFER_OBJECT_SIZE_64 (GBINDER_MAX_BUFFER_OBJECT_SIZE)
-#define BINDER_OBJECT_SIZE_32 (16)
-#define BINDER_OBJECT_SIZE_64 (GBINDER_MAX_BINDER_OBJECT_SIZE)
-
static
void
test_int_inc(
@@ -70,6 +66,14 @@
return gbinder_buffer_new(driver, bytes->data, bytes->len, NULL);
}
+static
+GBinderLocalReply*
+test_local_reply_new()
+{
+ return gbinder_local_reply_new(&gbinder_io_32,
+ gbinder_rpc_protocol_for_device(NULL));
+}
+
/*==========================================================================*
* null
*==========================================================================*/
@@ -82,7 +86,10 @@
GBinderWriter writer;
int count = 0;
- g_assert(!gbinder_local_reply_new(NULL));
+ g_assert(!gbinder_local_reply_new(NULL, NULL));
+ g_assert(!gbinder_local_reply_new(&gbinder_io_32, NULL));
+ g_assert(!gbinder_local_reply_new(NULL,
+ gbinder_rpc_protocol_for_device(NULL)));
g_assert(!gbinder_local_reply_ref(NULL));
gbinder_local_reply_unref(NULL);
gbinder_local_reply_init_writer(NULL, NULL);
@@ -118,7 +125,7 @@
test_cleanup(
void)
{
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
int count = 0;
gbinder_local_reply_cleanup(reply, NULL, &count);
@@ -141,7 +148,7 @@
{
static const guint8 output_true[] = { 0x01, 0x00, 0x00, 0x00 };
static const guint8 output_false[] = { 0x00, 0x00, 0x00, 0x00 };
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_bool(reply, FALSE);
@@ -152,7 +159,7 @@
g_assert(!memcmp(data->bytes->data, output_false, data->bytes->len));
gbinder_local_reply_unref(reply);
- reply = gbinder_local_reply_new(&gbinder_io_32);
+ reply = test_local_reply_new();
gbinder_local_reply_append_bool(reply, TRUE);
data = gbinder_local_reply_data(reply);
g_assert(!gbinder_output_data_offsets(data));
@@ -161,7 +168,7 @@
g_assert(!memcmp(data->bytes->data, output_true, data->bytes->len));
gbinder_local_reply_unref(reply);
- reply = gbinder_local_reply_new(&gbinder_io_32);
+ reply = test_local_reply_new();
gbinder_local_reply_append_bool(reply, 42);
data = gbinder_local_reply_data(reply);
g_assert(!gbinder_output_data_offsets(data));
@@ -181,7 +188,7 @@
void)
{
const gint32 fd = 1;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
GUtilIntArray* offsets;
@@ -206,7 +213,7 @@
void)
{
const guint32 value = 1234567;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -221,7 +228,7 @@
gbinder_local_reply_unref(reply);
/* Same with writer */
- reply = gbinder_local_reply_new(&gbinder_io_32);
+ reply = test_local_reply_new();
gbinder_local_reply_init_writer(reply, &writer);
gbinder_writer_append_int32(&writer, value);
data = gbinder_local_reply_data(reply);
@@ -242,7 +249,7 @@
void)
{
const guint64 value = 123456789;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_int64(reply, value);
@@ -264,7 +271,7 @@
void)
{
const gfloat value = 123456789;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_float(reply, value);
@@ -286,7 +293,7 @@
void)
{
const gdouble value = 123456789;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_double(reply, value);
@@ -310,7 +317,7 @@
/* The size of the string gets aligned at 4-byte boundary */
static const char input[] = "test";
static const guint8 output[] = { 't', 'e', 's', 't', 0, 0, 0, 0 };
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_string8(reply, input);
@@ -322,7 +329,7 @@
gbinder_local_reply_unref(reply);
/* NULL string doesn't get encoded at all (should it be?) */
- reply = gbinder_local_reply_new(&gbinder_io_32);
+ reply = test_local_reply_new();
gbinder_local_reply_append_string8(reply, NULL);
data = gbinder_local_reply_data(reply);
g_assert(!gbinder_output_data_offsets(data));
@@ -346,7 +353,7 @@
TEST_INT16_BYTES('x'), 0x00, 0x00
};
const gint32 null_output = -1;
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
gbinder_local_reply_append_string16(reply, input);
@@ -358,7 +365,7 @@
gbinder_local_reply_unref(reply);
/* NULL string gets encoded as -1 */
- reply = gbinder_local_reply_new(&gbinder_io_32);
+ reply = test_local_reply_new();
gbinder_local_reply_append_string16(reply, NULL);
data = gbinder_local_reply_data(reply);
g_assert(!gbinder_output_data_offsets(data));
@@ -377,7 +384,7 @@
test_hidl_string(
void)
{
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
GUtilIntArray* offsets;
@@ -400,7 +407,7 @@
test_hidl_string_vec(
void)
{
- GBinderLocalReply* reply = gbinder_local_reply_new(&gbinder_io_32);
+ GBinderLocalReply* reply = test_local_reply_new();
GBinderOutputData* data;
GUtilIntArray* offsets;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_local_request/unit_local_request.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -35,6 +35,7 @@
#include "gbinder_local_request_p.h"
#include "gbinder_output_data.h"
+#include "gbinder_rpc_protocol.h"
#include "gbinder_buffer_p.h"
#include "gbinder_driver.h"
#include "gbinder_writer.h"
@@ -44,11 +45,6 @@
static TestOpt test_opt;
-#define BUFFER_OBJECT_SIZE_32 (24)
-#define BUFFER_OBJECT_SIZE_64 (GBINDER_MAX_BUFFER_OBJECT_SIZE)
-#define BINDER_OBJECT_SIZE_32 (16)
-#define BINDER_OBJECT_SIZE_64 (GBINDER_MAX_BINDER_OBJECT_SIZE)
-
static
void
test_int_inc(
@@ -80,6 +76,14 @@
return gbinder_buffer_new(driver, bytes->data, bytes->len, objects);
}
+static
+GBinderLocalRequest*
+test_local_request_new()
+{
+ return gbinder_local_request_new(&gbinder_io_32,
+ gbinder_rpc_protocol_for_device(NULL), NULL);
+}
+
/*==========================================================================*
* null
*==========================================================================*/
@@ -92,7 +96,10 @@
GBinderWriter writer;
int count = 0;
- g_assert(!gbinder_local_request_new(NULL, NULL));
+ g_assert(!gbinder_local_request_new(NULL, NULL, NULL));
+ g_assert(!gbinder_local_request_new(&gbinder_io_32, NULL, NULL));
+ g_assert(!gbinder_local_request_new(NULL,
+ gbinder_rpc_protocol_for_device(NULL), NULL));
g_assert(!gbinder_local_request_ref(NULL));
g_assert(!gbinder_local_request_new_from_data(NULL, NULL));
gbinder_local_request_unref(NULL);
@@ -125,7 +132,7 @@
test_cleanup(
void)
{
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
int count = 0;
gbinder_local_request_cleanup(req, NULL, &count);
@@ -149,7 +156,7 @@
const guint8 init_data[] = { 0x01, 0x02, 0x03, 0x04 };
GBytes* init_bytes = g_bytes_new_static(init_data, sizeof(init_data));
GBinderLocalRequest* req = gbinder_local_request_new
- (&gbinder_io_32, init_bytes);
+ (&gbinder_io_32, gbinder_rpc_protocol_for_device(NULL), init_bytes);
GBinderOutputData* data;
data = gbinder_local_request_data(req);
@@ -161,7 +168,7 @@
gbinder_local_request_unref(req);
gbinder_local_request_unref(req);
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = test_local_request_new();
data = gbinder_local_request_data(req);
g_assert(data->bytes);
g_assert(!data->bytes->len);
@@ -181,7 +188,7 @@
{
static const guint8 output_true[] = { 0x01, 0x00, 0x00, 0x00 };
static const guint8 output_false[] = { 0x00, 0x00, 0x00, 0x00 };
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_bool(req, FALSE);
@@ -192,7 +199,7 @@
g_assert(!memcmp(data->bytes->data, output_false, data->bytes->len));
gbinder_local_request_unref(req);
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = test_local_request_new();
gbinder_local_request_append_bool(req, TRUE);
data = gbinder_local_request_data(req);
g_assert(!gbinder_output_data_offsets(data));
@@ -201,7 +208,7 @@
g_assert(!memcmp(data->bytes->data, output_true, data->bytes->len));
gbinder_local_request_unref(req);
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = test_local_request_new();
gbinder_local_request_append_bool(req, 42);
data = gbinder_local_request_data(req);
g_assert(!gbinder_output_data_offsets(data));
@@ -221,7 +228,7 @@
void)
{
const guint32 value = 1234567;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_int32(req, value);
@@ -243,7 +250,7 @@
void)
{
const guint64 value = 123456789;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_int64(req, value);
@@ -265,7 +272,7 @@
void)
{
const gfloat value = 123456789;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_float(req, value);
@@ -287,7 +294,7 @@
void)
{
const gdouble value = 123456789;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_double(req, value);
@@ -311,7 +318,7 @@
/* The size of the string gets aligned at 4-byte boundary */
static const char input[] = "test";
static const guint8 output[] = { 't', 'e', 's', 't', 0, 0, 0, 0 };
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_string8(req, input);
@@ -323,7 +330,7 @@
gbinder_local_request_unref(req);
/* NULL string doesn't get encoded at all (should it be?) */
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = test_local_request_new();
gbinder_local_request_append_string8(req, NULL);
data = gbinder_local_request_data(req);
g_assert(!gbinder_output_data_offsets(data));
@@ -347,7 +354,7 @@
TEST_INT16_BYTES('x'), 0x00, 0x00
};
const gint32 null_output = -1;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
gbinder_local_request_append_string16(req, input);
@@ -359,7 +366,7 @@
gbinder_local_request_unref(req);
/* NULL string gets encoded as -1 */
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = test_local_request_new();
gbinder_local_request_append_string16(req, NULL);
data = gbinder_local_request_data(req);
g_assert(!gbinder_output_data_offsets(data));
@@ -378,7 +385,7 @@
test_hidl_string(
void)
{
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GUtilIntArray* offsets;
@@ -401,7 +408,7 @@
test_hidl_string_vec(
void)
{
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GUtilIntArray* offsets;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_protocol/unit_protocol.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2020 Jolla Ltd.
- * Copyright (C) 2018-2020 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -184,6 +184,9 @@
void)
{
const GBinderRpcProtocol* p;
+ TestConfig config;
+
+ test_config_init(&config, "");
p = gbinder_rpc_protocol_for_device(NULL);
g_assert(p);
@@ -196,6 +199,8 @@
p = gbinder_rpc_protocol_for_device(GBINDER_DEFAULT_HWBINDER);
g_assert(p);
g_assert_cmpstr(p->name, == ,"hidl");
+
+ test_config_cleanup(&config);
}
/*==========================================================================*
@@ -388,7 +393,8 @@
test_config_init2(&config, test->dev, test->prot);
prot = gbinder_rpc_protocol_for_device(test->dev);
- req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ req = gbinder_local_request_new(&gbinder_io_32,
+ gbinder_rpc_protocol_for_device(NULL), NULL);
gbinder_local_request_init_writer(req, &writer);
prot->write_rpc_header(&writer, test->iface);
data = gbinder_local_request_data(req);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_proxy_object/unit_proxy_object.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
- * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021-2022 Jolla Ltd.
+ * Copyright (C) 2021-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -198,8 +198,8 @@
int fd_obj, fd_proxy, n = 0;
test_config_init(&config, NULL);
- ipc_proxy = gbinder_ipc_new(DEV);
- ipc_obj = gbinder_ipc_new(DEV_PRIV);
+ ipc_proxy = gbinder_ipc_new(DEV, NULL);
+ ipc_obj = gbinder_ipc_new(DEV_PRIV, NULL);
fd_proxy = gbinder_driver_fd(ipc_proxy->driver);
fd_obj = gbinder_driver_fd(ipc_obj->driver);
obj = gbinder_local_object_new(ipc_obj, TEST_IFACES, test_basic_cb, &n);
@@ -362,10 +362,10 @@
int fd_obj, fd_proxy, n = 0;
test_config_init(&config, NULL);
- ipc_obj = gbinder_ipc_new(DEV);
- ipc_remote_obj = gbinder_ipc_new(DEV_PRIV);
- ipc_proxy = gbinder_ipc_new(DEV2);
- ipc_remote_proxy = gbinder_ipc_new(DEV2_PRIV);
+ ipc_obj = gbinder_ipc_new(DEV, NULL);
+ ipc_remote_obj = gbinder_ipc_new(DEV_PRIV, NULL);
+ ipc_proxy = gbinder_ipc_new(DEV2, NULL);
+ ipc_remote_proxy = gbinder_ipc_new(DEV2_PRIV, NULL);
fd_proxy = gbinder_driver_fd(ipc_proxy->driver);
fd_obj = gbinder_driver_fd(ipc_obj->driver);
obj = gbinder_local_object_new(ipc_obj, TEST_IFACES, test_param_cb, &n);
@@ -610,17 +610,18 @@
memset(&test, 0, sizeof(test));
test.loop = g_main_loop_new(NULL, FALSE);
- ipc_remote_obj = gbinder_ipc_new(DEV_PRIV);
- ipc_obj = gbinder_ipc_new(DEV);
- ipc_proxy = gbinder_ipc_new(DEV2);
- ipc_remote_proxy = gbinder_ipc_new(DEV2_PRIV);
+ ipc_remote_obj = gbinder_ipc_new(DEV_PRIV, NULL);
+ ipc_obj = gbinder_ipc_new(DEV, NULL);
+ ipc_proxy = gbinder_ipc_new(DEV2, NULL);
+ ipc_remote_proxy = gbinder_ipc_new(DEV2_PRIV, NULL);
fd_remote_obj = gbinder_driver_fd(ipc_remote_obj->driver);
fd_obj = gbinder_driver_fd(ipc_obj->driver);
fd_proxy = gbinder_driver_fd(ipc_proxy->driver);
fd_remote_proxy = gbinder_driver_fd(ipc_remote_proxy->driver);
- obj = gbinder_local_object_new(ipc_remote_obj, TEST_IFACES, test_obj_cb, &test);
+ obj = gbinder_local_object_new(ipc_remote_obj, TEST_IFACES,
+ test_obj_cb, &test);
GDEBUG("obj %p", obj);
remote_obj = gbinder_remote_object_new(ipc_obj,
test_binder_register_object(fd_obj, obj, AUTO_HANDLE),
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_reader/unit_reader.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -39,6 +39,8 @@
#include "gbinder_remote_object_p.h"
#include "gbinder_io.h"
+#include <gutil_misc.h>
+
#include <unistd.h>
#include <fcntl.h>
@@ -65,6 +67,20 @@
#define BUFFER_OBJECT_SIZE_64 (GBINDER_MAX_BUFFER_OBJECT_SIZE)
G_STATIC_ASSERT(sizeof(BinderObject64) == BUFFER_OBJECT_SIZE_64);
+static
+void
+test_init_reader(
+ GBinderDriver* driver,
+ GBinderReaderData* data,
+ GBinderReader* reader,
+ const void* bytes,
+ gsize size)
+{
+ data->buffer = gbinder_buffer_new(driver, gutil_memdup(bytes, size),
+ size, NULL);
+ gbinder_reader_init(reader, data, 0, size);
+}
+
/*==========================================================================*
* null
*==========================================================================*/
@@ -119,6 +135,7 @@
g_assert(!gbinder_reader_read_object(&reader));
g_assert(!gbinder_reader_read_nullable_object(&reader, NULL));
g_assert(!gbinder_reader_read_buffer(&reader));
+ g_assert(!gbinder_reader_read_parcelable(&reader, NULL));
g_assert(!gbinder_reader_read_hidl_struct1(&reader, 1));
g_assert(!gbinder_reader_read_hidl_vec(&reader, NULL, NULL));
g_assert(!gbinder_reader_read_hidl_vec(&reader, &count, &elemsize));
@@ -752,7 +769,7 @@
gconstpointer test_data)
{
const TestHidlStruct* test = test_data;
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(test->in, test->in_size), test->in_size, NULL);
GBinderReaderData data;
@@ -956,7 +973,7 @@
gconstpointer test_data)
{
const TestHidlVec* test = test_data;
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(test->in, test->in_size), test->in_size, NULL);
GBinderReaderData data;
@@ -1062,7 +1079,7 @@
gconstpointer test_data)
{
const TestHidlStringErr* test = test_data;
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(test->in, test->in_size), test->in_size, NULL);
GBinderReaderData data;
@@ -1096,7 +1113,7 @@
gconstpointer test_data)
{
const TestHidlStringErr* test = test_data;
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(test->in, test->in_size), test->in_size, NULL);
GBinderReaderData data;
@@ -1141,7 +1158,7 @@
TEST_INT32_BYTES(fd), TEST_INT32_BYTES(0),
TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1181,7 +1198,7 @@
TEST_INT32_BYTES(BINDER_TYPE_FD),
TEST_INT32_BYTES(0x7f | BINDER_FLAG_ACCEPTS_FDS)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1215,7 +1232,7 @@
TEST_INT32_BYTES(fd), TEST_INT32_BYTES(0),
TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1258,7 +1275,7 @@
TEST_INT32_BYTES(fd), TEST_INT32_BYTES(0),
TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1305,7 +1322,7 @@
TEST_INT32_BYTES(fd), TEST_INT32_BYTES(0),
TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1348,7 +1365,7 @@
TEST_INT32_BYTES(fd), TEST_INT32_BYTES(0),
TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderReaderData data;
@@ -1387,7 +1404,7 @@
guint bufcount,
const char* result)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver, g_memdup(input, size),
size, NULL);
GBinderRemoteObject* obj = NULL;
@@ -1658,7 +1675,7 @@
TEST_INT64_BYTES(0), TEST_INT64_BYTES(0),
TEST_INT64_BYTES(0), TEST_INT64_BYTES(0)
};
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
GBinderBuffer* buf = gbinder_buffer_new(ipc->driver,
g_memdup(input, sizeof(input)), sizeof(input), NULL);
GBinderRemoteObject* obj = NULL;
@@ -1693,6 +1710,98 @@
}
/*==========================================================================*
+ * parcelable
+ *==========================================================================*/
+
+static
+void
+test_parcelable(
+ void)
+{
+ const guint8 input_null_header[] = {
+ TEST_INT32_BYTES(0)
+ };
+ const guint8 input_broken_header[] = {
+ TEST_INT32_BYTES(1),
+ TEST_INT32_BYTES(1)
+ };
+ const guint8 input_non_null_header[] = {
+ TEST_INT32_BYTES(1),
+ /* Size must be size of itself + payload */
+ TEST_INT32_BYTES(sizeof(gint32) * 3)
+ };
+ const guint8 input_non_null_payload[] = {
+ TEST_INT32_BYTES(10),
+ TEST_INT32_BYTES(20)
+ };
+ gpointer in;
+ gsize in_size, out_size;
+ const void* out = 0;
+ GBinderDriver* driver = gbinder_driver_new(GBINDER_DEFAULT_BINDER, NULL);
+ GBinderReader reader;
+ GBinderReaderData data;
+
+ g_assert(driver);
+ memset(&data, 0, sizeof(data));
+
+ /* Missing payload */
+ test_init_reader(driver, &data, &reader,
+ TEST_ARRAY_AND_SIZE(input_non_null_header));
+ out = gbinder_reader_read_parcelable(&reader, &out_size);
+ g_assert(!out);
+ g_assert_cmpuint(out_size, == ,0);
+ gbinder_buffer_free(data.buffer);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_remote_object/unit_remote_object.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -68,7 +68,7 @@
test_basic(
void)
{
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
GBinderRemoteObject* obj1 = gbinder_object_registry_get_remote(reg,1,TRUE);
GBinderRemoteObject* obj2 = gbinder_object_registry_get_remote(reg,2,TRUE);
@@ -112,7 +112,7 @@
{
const guint h = 1;
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
- GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ GBinderIpc* ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
GBinderObjectRegistry* reg = gbinder_ipc_object_registry(ipc);
const int fd = gbinder_driver_fd(ipc->driver);
GBinderRemoteObject* obj = gbinder_object_registry_get_remote(reg, h, TRUE);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_remote_reply/unit_remote_reply.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -31,6 +31,7 @@
*/
#include "test_common.h"
+#include "test_binder.h"
#include "gbinder_buffer_p.h"
#include "gbinder_driver.h"
@@ -44,9 +45,6 @@
static TestOpt test_opt;
-#define BINDER_TYPE_BINDER GBINDER_FOURCC('s', 'b', '*', 0x85)
-#define BINDER_OBJECT_SIZE_64 (GBINDER_MAX_BINDER_OBJECT_SIZE)
-
/*==========================================================================*
* Dummy GBinderObjectRegistry functions
*==========================================================================*/
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_remote_request/unit_remote_request.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -31,8 +31,10 @@
*/
#include "test_common.h"
+#include "test_binder.h"
#include "gbinder_buffer_p.h"
+#include "gbinder_config.h"
#include "gbinder_driver.h"
#include "gbinder_reader.h"
#include "gbinder_remote_request_p.h"
@@ -58,9 +60,6 @@
#define HIDL_RPC_HEADER \
'f', 'o', 'o', 0x00
-#define BINDER_TYPE_BINDER GBINDER_FOURCC('s', 'b', '*', 0x85)
-#define BINDER_OBJECT_SIZE_64 (GBINDER_MAX_BINDER_OBJECT_SIZE)
-
/*==========================================================================*
* null
*==========================================================================*/
@@ -369,6 +368,18 @@
int main(int argc, char* argv[])
{
+ const char* default_config_dir;
+ const char* default_config_file;
+ char* conf_dir = g_dir_make_tmp("gbinder-test-remote-request-XXXXXX", NULL);
+ char* conf_file = g_build_filename(conf_dir, "test.conf", NULL);
+ int result;
+
+ /* Point gbinder_config_file to a non-existent file */
+ default_config_dir = gbinder_config_dir;
+ default_config_file = gbinder_config_file;
+ gbinder_config_dir = conf_dir;
+ gbinder_config_file = conf_file;
+
g_test_init(&argc, &argv, NULL);
g_test_add_func(TEST_PREFIX "null", test_null);
g_test_add_func(TEST_PREFIX "basic", test_basic);
@@ -378,7 +389,14 @@
g_test_add_func(TEST_PREFIX "string16", test_string16);
g_test_add_func(TEST_PREFIX "to_local", test_to_local);
test_init(&test_opt, argc, argv);
- return g_test_run();
+ result = g_test_run();
+
+ gbinder_config_dir = default_config_dir;
+ gbinder_config_file = default_config_file;
+ remove(conf_dir);
+ g_free(conf_dir);
+ g_free(conf_file);
+ return result;
}
/*
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager/unit_servicemanager.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -399,6 +399,14 @@
return 0;
}
+GType
+gbinder_servicemanager_aidl4_get_type()
+{
+ /* Dummy function to avoid pulling in gbinder_servicemanager_aidl4 */
+ g_assert_not_reached();
+ return 0;
+}
+
/*==========================================================================*
* null
*==========================================================================*/
@@ -409,7 +417,7 @@
void)
{
g_assert(!gbinder_servicemanager_new(NULL));
- g_assert(!gbinder_servicemanager_new_with_type(0, NULL));
+ g_assert(!gbinder_servicemanager_new_with_type(0, NULL, NULL));
g_assert(!gbinder_servicemanager_new_local_object(NULL, NULL, NULL, NULL));
g_assert(!gbinder_servicemanager_ref(NULL));
g_assert(!gbinder_servicemanager_device(NULL));
@@ -442,14 +450,15 @@
{
int status = 0;
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderServiceManager* sm;
gulong id = 0;
test_setup_ping(ipc);
+ g_assert(!gbinder_servicemanager_new2(GBINDER_DEFAULT_HWBINDER, "a", NULL));
sm = gbinder_servicemanager_new(dev);
g_assert(!gbinder_servicemanager_new_with_type(GBINDER_TYPE_LOCAL_OBJECT,
- NULL));
+ NULL, NULL));
g_assert(TEST_IS_HWSERVICEMANAGER(sm));
g_assert(!gbinder_servicemanager_list(sm, NULL, NULL));
g_assert(!gbinder_servicemanager_get_service(sm, "foo", NULL, NULL));
@@ -487,7 +496,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderServiceManager* sm;
GBinderLocalObject* obj;
@@ -518,7 +527,7 @@
{
const char* otherdev = "/dev/otherbinder";
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderServiceManager* sm;
/* Reset the state */
@@ -539,7 +548,7 @@
gbinder_ipc_unref(ipc);
/* Legacy default */
- ipc = gbinder_ipc_new(otherdev);
+ ipc = gbinder_ipc_new(otherdev, NULL);
test_setup_ping(ipc);
sm = gbinder_servicemanager_new(otherdev);
g_assert(TEST_IS_DEFSERVICEMANAGER(sm));
@@ -582,7 +591,7 @@
gbinder_config_file = file;
/* Unknown device instantiates the default */
- ipc = gbinder_ipc_new(strange_name);
+ ipc = gbinder_ipc_new(strange_name, NULL);
test_setup_ping(ipc);
sm = gbinder_servicemanager_new(strange_name);
g_assert(TEST_IS_HWSERVICEMANAGER(sm));
@@ -590,7 +599,7 @@
gbinder_ipc_unref(ipc);
/* This one was redefined */
- ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER);
+ ipc = gbinder_ipc_new(GBINDER_DEFAULT_BINDER, NULL);
test_setup_ping(ipc);
sm = gbinder_servicemanager_new(GBINDER_DEFAULT_BINDER);
g_assert(TEST_IS_HWSERVICEMANAGER(sm));
@@ -598,7 +607,7 @@
gbinder_ipc_unref(ipc);
/* This one was not (since name was invalid) */
- ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER);
+ ipc = gbinder_ipc_new(GBINDER_DEFAULT_HWBINDER, NULL);
test_setup_ping(ipc);
sm = gbinder_servicemanager_new(GBINDER_DEFAULT_HWBINDER);
g_assert(TEST_IS_HWSERVICEMANAGER(sm));
@@ -606,13 +615,21 @@
gbinder_ipc_unref(ipc);
/* This one points to legacy manager */
- ipc = gbinder_ipc_new(legacy_name);
+ ipc = gbinder_ipc_new(legacy_name, NULL);
test_setup_ping(ipc);
sm = gbinder_servicemanager_new(legacy_name);
g_assert(TEST_IS_DEFSERVICEMANAGER(sm));
gbinder_servicemanager_unref(sm);
gbinder_ipc_unref(ipc);
+ /* Overwrite the legacy manager with "hidl" */
+ ipc = gbinder_ipc_new(legacy_name, "hidl");
+ test_setup_ping(ipc);
+ sm = gbinder_servicemanager_new2(legacy_name, "hidl", "hidl");
+ g_assert(TEST_IS_HWSERVICEMANAGER(sm));
+ gbinder_servicemanager_unref(sm);
+ gbinder_ipc_unref(ipc);
+
/* Clear the state */
gbinder_servicemanager_exit();
gbinder_config_exit();
@@ -634,7 +651,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GBinderServiceManager* sm;
@@ -659,7 +676,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
const glong forever = (test_opt.flags & TEST_FLAG_DEBUG) ?
(TEST_TIMEOUT_SEC * 1000) : -1;
@@ -710,7 +727,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GBinderServiceManager* sm;
gulong id;
@@ -756,7 +773,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServiceManager* sm;
@@ -800,7 +817,7 @@
test_death_run()
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServiceManager* sm;
@@ -877,7 +894,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServiceManager* sm;
@@ -932,9 +949,9 @@
const char* binder_dev = GBINDER_DEFAULT_BINDER;
const char* vndbinder_dev = "/dev/vpnbinder";
const char* hwbinder_dev = GBINDER_DEFAULT_HWBINDER;
- GBinderIpc* binder_ipc = gbinder_ipc_new(binder_dev);
- GBinderIpc* vndbinder_ipc = gbinder_ipc_new(vndbinder_dev);
- GBinderIpc* hwbinder_ipc = gbinder_ipc_new(hwbinder_dev);
+ GBinderIpc* binder_ipc = gbinder_ipc_new(binder_dev, NULL);
+ GBinderIpc* vndbinder_ipc = gbinder_ipc_new(vndbinder_dev, NULL);
+ GBinderIpc* hwbinder_ipc = gbinder_ipc_new(hwbinder_dev, NULL);
GBinderServiceManager* m1;
GBinderServiceManager* m2;
GBinderServiceManager* vnd1;
@@ -987,7 +1004,7 @@
GType t,
const char* dev)
{
- GBinderIpc* ipc = gbinder_ipc_new(dev);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_aidl/unit_servicemanager_aidl.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2020-2021 Jolla Ltd.
- * Copyright (C) 2020-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -71,6 +71,14 @@
return 0;
}
+GType
+gbinder_servicemanager_aidl4_get_type()
+{
+ /* Dummy function to avoid pulling in gbinder_servicemanager_aidl4 */
+ g_assert_not_reached();
+ return 0;
+}
+
/*==========================================================================*
* Test service manager
*==========================================================================*/
@@ -182,7 +190,7 @@
{
ServiceManagerAidl* self = g_object_new(SERVICE_MANAGER_AIDL_TYPE, NULL);
GBinderLocalObject* obj = GBINDER_LOCAL_OBJECT(self);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
self->handle_on_looper_thread = handle_on_looper_thread;
@@ -322,7 +330,7 @@
{
const char* dev = GBINDER_DEFAULT_BINDER;
const char* other_dev = GBINDER_DEFAULT_BINDER "-private";
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
ServiceManagerAidl* smsvc = servicemanager_aidl_new(other_dev, FALSE);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
@@ -404,7 +412,7 @@
{
const char* dev = GBINDER_DEFAULT_BINDER;
const char* other_dev = GBINDER_DEFAULT_BINDER "-private";
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
ServiceManagerAidl* smsvc = servicemanager_aidl_new(other_dev, FALSE);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
@@ -483,7 +491,7 @@
{
const char* dev = GBINDER_DEFAULT_BINDER;
const char* other_dev = GBINDER_DEFAULT_BINDER "-private";
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
ServiceManagerAidl* svc = servicemanager_aidl_new(other_dev, FALSE);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
@@ -540,7 +548,7 @@
{
const char* dev = GBINDER_DEFAULT_BINDER;
const char* other_dev = GBINDER_DEFAULT_BINDER "-private";
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
ServiceManagerAidl* smsvc = servicemanager_aidl_new(other_dev, TRUE);
GBinderLocalObject* obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_aidl2/unit_servicemanager_aidl2.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2020-2021 Jolla Ltd.
- * Copyright (C) 2020-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -175,7 +175,7 @@
{
ServiceManagerAidl2* self = g_object_new(SERVICE_MANAGER_AIDL2_TYPE, NULL);
GBinderLocalObject* obj = GBINDER_LOCAL_OBJECT(self);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
self->handle_on_looper_thread = handle_on_looper_thread;
@@ -305,7 +305,7 @@
gbinder_config_dir = test->config_subdir; /* Doesn't exist */
gbinder_config_file = test->config_file;
- ipc = gbinder_ipc_new(dev);
+ ipc = gbinder_ipc_new(dev, NULL);
test->fd = gbinder_driver_fd(ipc->driver);
test->object = gbinder_local_object_new(ipc, NULL, NULL, NULL);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_aidl3/unit_servicemanager_aidl3.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2020-2021 Jolla Ltd.
- * Copyright (C) 2020-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -51,13 +51,6 @@
static const char TMP_DIR_TEMPLATE[] =
"gbinder-test-servicemanager_aidl3-XXXXXX";
-enum gbinder_stability_level {
- UNDECLARED = 0,
- VENDOR = 0b000011,
- SYSTEM = 0b001100,
- VINTF = 0b111111
-};
-
GType
gbinder_servicemanager_hidl_get_type()
{
@@ -109,7 +102,6 @@
GBinderReader reader;
GBinderRemoteObject* remote_obj;
guint32 allow_isolated, dumpsys_priority;
- gint32 stability;
char* str;
g_assert(!flags);
@@ -122,18 +114,18 @@
gbinder_remote_request_init_reader(req, &reader);
str = gbinder_reader_read_string16(&reader);
if (str) {
- reply = gbinder_local_object_new_reply(obj);
+ GBinderWriter writer;
+
remote_obj = g_hash_table_lookup(self->objects, str);
- if (remote_obj) {
- GBinderWriter writer;
+ reply = gbinder_local_object_new_reply(obj);
+ gbinder_local_reply_init_writer(reply, &writer);
+ gbinder_writer_append_int32(&writer, GBINDER_STATUS_OK);
+ gbinder_writer_append_remote_object(&writer, remote_obj);
+ if (remote_obj) {
GDEBUG("Found name '%s' => %p", str, remote_obj);
- gbinder_local_reply_init_writer(reply, &writer);
- gbinder_writer_append_int32(&writer, UNDECLARED);
- gbinder_writer_append_remote_object(&writer, remote_obj);
} else {
GDEBUG("Name '%s' not found", str);
- gbinder_local_reply_append_int32(reply, GBINDER_STATUS_OK);
}
g_free(str);
}
@@ -142,8 +134,7 @@
gbinder_remote_request_init_reader(req, &reader);
str = gbinder_reader_read_string16(&reader);
remote_obj = gbinder_reader_read_object(&reader);
- gbinder_reader_read_int32(&reader, &stability);
- if (str && remote_obj && stability == 0b001100 &&
+ if (str && remote_obj &&
gbinder_reader_read_uint32(&reader, &allow_isolated) &&
gbinder_reader_read_uint32(&reader, &dumpsys_priority)) {
GDEBUG("Adding '%s'", str);
@@ -193,7 +184,7 @@
{
ServiceManagerAidl3* self = g_object_new(SERVICE_MANAGER_AIDL3_TYPE, NULL);
GBinderLocalObject* obj = GBINDER_LOCAL_OBJECT(self);
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
self->handle_on_looper_thread = handle_on_looper_thread;
@@ -323,7 +314,7 @@
gbinder_config_dir = test->config_subdir; /* Doesn't exist */
gbinder_config_file = test->config_file;
- ipc = gbinder_ipc_new(dev);
+ ipc = gbinder_ipc_new(dev, NULL);
test->fd = gbinder_driver_fd(ipc->driver);
test->object = gbinder_local_object_new(ipc, NULL, NULL, NULL);
|
|
[-]
[+]
|
Added |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_aidl4/Makefile
^
|
| @@ -0,0 +1,5 @@
+# -*- Mode: makefile-gmake -*-
+
+EXE = unit_servicemanager_aidl4
+
+include ../common/Makefile
|
|
[-]
[+]
|
Added |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_aidl4/unit_servicemanager_aidl4.c
^
|
| @@ -0,0 +1,485 @@
+/*
+ * Copyright (C) 2020-2022 Jolla Ltd.
+ * Copyright (C) 2020-2022 Slava Monich <slava.monich@jolla.com>
+ *
+ * You may use this file under the terms of BSD license as follows:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the names of the copyright holders nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "test_binder.h"
+
+#include "gbinder_driver.h"
+#include "gbinder_config.h"
+#include "gbinder_ipc.h"
+#include "gbinder_reader.h"
+#include "gbinder_servicemanager_p.h"
+#include "gbinder_rpc_protocol.h"
+#include "gbinder_local_object_p.h"
+#include "gbinder_local_reply.h"
+#include "gbinder_remote_request.h"
+#include "gbinder_remote_object.h"
+#include "gbinder_writer.h"
+
+#include <gutil_strv.h>
+#include <gutil_log.h>
+
+static TestOpt test_opt;
+static const char TMP_DIR_TEMPLATE[] =
+ "gbinder-test-servicemanager_aidl4-XXXXXX";
+
+GType
+gbinder_servicemanager_hidl_get_type()
+{
+ /* Dummy function to avoid pulling in gbinder_servicemanager_hidl */
+ g_assert_not_reached();
+ return 0;
+}
+
+/*==========================================================================*
+ * Test service manager
+ *==========================================================================*/
+
+#define SVCMGR_HANDLE (0)
+static const char SVCMGR_IFACE[] = "android.os.IServiceManager";
+enum servicemanager_aidl_tx {
+ GET_SERVICE_TRANSACTION = GBINDER_FIRST_CALL_TRANSACTION,
+ CHECK_SERVICE_TRANSACTION,
+ ADD_SERVICE_TRANSACTION,
+ LIST_SERVICES_TRANSACTION
+};
+
+const char* const servicemanager_aidl_ifaces[] = { SVCMGR_IFACE, NULL };
+
+typedef GBinderLocalObjectClass ServiceManagerAidl4Class;
+typedef struct service_manager_aidl4 {
+ GBinderLocalObject parent;
+ GHashTable* objects;
+ gboolean handle_on_looper_thread;
+} ServiceManagerAidl4;
+
+#define SERVICE_MANAGER_AIDL4_TYPE (service_manager_aidl4_get_type())
+#define SERVICE_MANAGER_AIDL4(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), \
+ SERVICE_MANAGER_AIDL4_TYPE, ServiceManagerAidl4))
+G_DEFINE_TYPE(ServiceManagerAidl4, service_manager_aidl4, \
+ GBINDER_TYPE_LOCAL_OBJECT)
+
+/* This should be eventually handled at lower level. */
+typedef struct category {
+ /*
+ * This is the version of the wire protocol associated with the host
+ * process of a particular binder. As the wire protocol changes, if
+ * sending a transaction to a binder with an old version, the Parcel
+ * class must write parcels according to the version documented here.
+ */
+ gint8 version;
+ gint8 reserved[2];
+ gint8 level; /* bitmask of Stability::Level */
+} Category;
+
+static
+GBinderLocalReply*
+servicemanager_aidl4_handler(
+ GBinderLocalObject* obj,
+ GBinderRemoteRequest* req,
+ guint code,
+ guint flags,
+ int* status,
+ void* user_data)
+{
+ ServiceManagerAidl4* self = user_data;
+ GBinderLocalReply* reply = NULL;
+ GBinderReader reader;
+ GBinderRemoteObject* remote_obj;
+ guint32 allow_isolated, dumpsys_priority;
+ char* str;
+ Category category;
+
+ g_assert(!flags);
+ GDEBUG("%s %u", gbinder_remote_request_interface(req), code);
+ g_assert_cmpstr(gbinder_remote_request_interface(req), == ,SVCMGR_IFACE);
+ *status = -1;
+ switch (code) {
+ case GET_SERVICE_TRANSACTION:
+ case CHECK_SERVICE_TRANSACTION:
+ gbinder_remote_request_init_reader(req, &reader);
+ str = gbinder_reader_read_string16(&reader);
+ if (str) {
+ reply = gbinder_local_object_new_reply(obj);
+ remote_obj = g_hash_table_lookup(self->objects, str);
+ if (str) {
+ GBinderWriter writer;
+
+ remote_obj = g_hash_table_lookup(self->objects, str);
+ reply = gbinder_local_object_new_reply(obj);
+
+ gbinder_local_reply_init_writer(reply, &writer);
+ gbinder_writer_append_int32(&writer, GBINDER_STATUS_OK);
+ gbinder_writer_append_remote_object(&writer, remote_obj);
+ if (remote_obj) {
+ GDEBUG("Found name '%s' => %p", str, remote_obj);
+ } else {
+ GDEBUG("Name '%s' not found", str);
+ }
+ g_free(str);
+ }
+ }
+ break;
+ case ADD_SERVICE_TRANSACTION:
+ gbinder_remote_request_init_reader(req, &reader);
+ str = gbinder_reader_read_string16(&reader);
+ remote_obj = gbinder_reader_read_object(&reader);
+ gbinder_reader_read_uint32(&reader, (guint32*)&category);
+ if (str && remote_obj &&
+ category.level == GBINDER_STABILITY_SYSTEM &&
+ category.version == 1 &&
+ gbinder_reader_read_uint32(&reader, &allow_isolated) &&
+ gbinder_reader_read_uint32(&reader, &dumpsys_priority)) {
+ GDEBUG("Adding '%s'", str);
+ g_hash_table_replace(self->objects, str, remote_obj);
+ remote_obj = NULL;
+ str = NULL;
+ reply = gbinder_local_object_new_reply(obj);
+ *status = GBINDER_STATUS_OK;
+ }
+ g_free(str);
+ gbinder_remote_object_unref(remote_obj);
+ break;
+ case LIST_SERVICES_TRANSACTION:
+ gbinder_remote_request_init_reader(req, &reader);
+ if (gbinder_reader_read_uint32(&reader, &dumpsys_priority)) {
+ if (g_hash_table_size(self->objects) == 1) {
+ GList* keys = g_hash_table_get_keys(self->objects);
+ GList* l = g_list_nth(keys, 0);
+ gint32 srv_size = 1;
+ GBinderWriter writer;
+
+ reply = gbinder_local_object_new_reply(obj);
+ gbinder_local_reply_init_writer(reply, &writer);
+ gbinder_writer_append_int32(&writer, GBINDER_STATUS_OK);
+ gbinder_writer_append_int32(&writer, srv_size);
+ gbinder_writer_append_string16(&writer, l->data);
+ g_list_free(keys);
+ *status = GBINDER_STATUS_OK;
+ } else {
+ GDEBUG("Incorrect number of services %u",
+ g_hash_table_size(self->objects));
+ }
+ }
+ break;
+ default:
+ GDEBUG("Unhandled command %u", code);
+ break;
+ }
+ return reply;
+}
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicemanager_hidl/unit_servicemanager_hidl.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2021 Jolla Ltd.
- * Copyright (C) 2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2021-2022 Jolla Ltd.
+ * Copyright (C) 2021-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -82,6 +82,14 @@
return 0;
}
+GType
+gbinder_servicemanager_aidl4_get_type()
+{
+ /* Dummy function to avoid pulling in gbinder_servicemanager_aidl4 */
+ g_assert_not_reached();
+ return 0;
+}
+
/*==========================================================================*
* Common
*==========================================================================*/
@@ -122,7 +130,7 @@
test_servicemanager_impl_new(
const char* dev)
{
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
TestServiceManagerHidl* sm = test_servicemanager_hidl_new(ipc);
@@ -191,7 +199,7 @@
const char* name = "android.hidl.base@1.0::IBase/test";
test_config_init(&config, NULL);
- ipc = gbinder_ipc_new(MAIN_DEV);
+ ipc = gbinder_ipc_new(MAIN_DEV, NULL);
smsvc = test_servicemanager_impl_new(OTHER_DEV);
obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
fd = gbinder_driver_fd(ipc->driver);
@@ -286,7 +294,7 @@
test.loop = g_main_loop_new(NULL, FALSE);
test_config_init(&config, NULL);
- ipc = gbinder_ipc_new(MAIN_DEV);
+ ipc = gbinder_ipc_new(MAIN_DEV, NULL);
smsvc = test_servicemanager_impl_new(OTHER_DEV);
obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
fd = gbinder_driver_fd(ipc->driver);
@@ -414,7 +422,7 @@
test.loop = g_main_loop_new(NULL, FALSE);
test_config_init(&config, NULL);
- ipc = gbinder_ipc_new(MAIN_DEV);
+ ipc = gbinder_ipc_new(MAIN_DEV, NULL);
test.smsvc = test_servicemanager_impl_new(OTHER_DEV);
obj = gbinder_local_object_new(ipc, NULL, NULL, NULL);
fd = gbinder_driver_fd(ipc->driver);
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicename/unit_servicename.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2019-2021 Jolla Ltd.
- * Copyright (C) 2019-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2019-2022 Jolla Ltd.
+ * Copyright (C) 2019-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -241,6 +241,12 @@
}
GType
+gbinder_servicemanager_aidl4_get_type()
+{
+ return TEST_TYPE_SERVICEMANAGER;
+}
+
+GType
gbinder_servicemanager_hidl_get_type()
{
return TEST_TYPE_SERVICEMANAGER;
@@ -256,7 +262,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderServiceManager* sm;
test_setup_ping(ipc);
@@ -283,7 +289,7 @@
const char* obj_name = "test";
const char* dev = GBINDER_DEFAULT_BINDER;
const char* const ifaces[] = { "interface", NULL };
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderLocalObject* obj;
GBinderServiceManager* sm;
@@ -321,7 +327,7 @@
const char* obj_name = "test";
const char* const ifaces[] = { "interface", NULL };
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderLocalObject* obj;
@@ -382,7 +388,7 @@
const char* obj_name = "test";
const char* const ifaces[] = { "interface", NULL };
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderLocalObject* obj;
@@ -427,7 +433,7 @@
const char* obj_name = "test";
const char* const ifaces[] = { "interface", NULL };
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderLocalObject* obj;
@@ -470,7 +476,7 @@
const char* obj_name = "test";
const char* const ifaces[] = { "interface", NULL };
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
const int fd = gbinder_driver_fd(ipc->driver);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderLocalObject* obj;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_servicepoll/unit_servicepoll.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -207,6 +207,12 @@
}
GType
+gbinder_servicemanager_aidl4_get_type()
+{
+ return TEST_TYPE_SERVICEMANAGER;
+}
+
+GType
gbinder_servicemanager_hidl_get_type()
{
return TEST_TYPE_SERVICEMANAGER;
@@ -239,7 +245,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GBinderServicePoll* weakptr = NULL;
GBinderServiceManager* manager;
GBinderServicePoll* poll;
@@ -315,7 +321,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServicePoll* weakptr = NULL;
GBinderServiceManager* manager;
@@ -389,7 +395,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServicePoll* weakptr = NULL;
GBinderServiceManager* manager;
@@ -448,7 +454,7 @@
void)
{
const char* dev = GBINDER_DEFAULT_BINDER;
- GBinderIpc* ipc = gbinder_ipc_new(dev);
+ GBinderIpc* ipc = gbinder_ipc_new(dev, NULL);
GMainLoop* loop = g_main_loop_new(NULL, FALSE);
GBinderServicePoll* weakptr = NULL;
GBinderServiceManager* manager;
|
|
[-]
[+]
|
Changed |
_service:tar_git:libgbinder-1.1.30.tar.bz2/unit/unit_writer/unit_writer.c
^
|
| @@ -1,6 +1,6 @@
/*
- * Copyright (C) 2018-2021 Jolla Ltd.
- * Copyright (C) 2018-2021 Slava Monich <slava.monich@jolla.com>
+ * Copyright (C) 2018-2022 Jolla Ltd.
+ * Copyright (C) 2018-2022 Slava Monich <slava.monich@jolla.com>
*
* You may use this file under the terms of BSD license as follows:
*
@@ -31,9 +31,12 @@
*/
#include "test_common.h"
+#include "test_binder.h"
+#include "gbinder_config.h"
#include "gbinder_fmq_p.h"
#include "gbinder_local_request_p.h"
+#include "gbinder_rpc_protocol.h"
#include "gbinder_output_data.h"
#include "gbinder_writer_p.h"
#include "gbinder_io.h"
@@ -45,11 +48,82 @@
#include <errno.h>
static TestOpt test_opt;
+static const char TMP_DIR_TEMPLATE[] = "gbinder-test-writer-XXXXXX";
-#define BUFFER_OBJECT_SIZE_32 (24)
-#define BUFFER_OBJECT_SIZE_64 (GBINDER_MAX_BUFFER_OBJECT_SIZE)
-#define BINDER_OBJECT_SIZE_32 (16)
-#define BINDER_OBJECT_SIZE_64 (GBINDER_MAX_BINDER_OBJECT_SIZE)
+static
+GBinderLocalRequest*
+test_local_request_new_with_io(
+ const GBinderIo* io)
+{
+ return gbinder_local_request_new(io,
+ gbinder_rpc_protocol_for_device(GBINDER_DEFAULT_BINDER), NULL);
+}
+
+static
+GBinderLocalRequest*
+test_local_request_new()
+{
+ return test_local_request_new_with_io(&gbinder_io_32);
+}
+
+static
+GBinderLocalRequest*
+test_local_request_new_64()
+{
+ return test_local_request_new_with_io(&gbinder_io_64);
+}
+
+/*==========================================================================*
+ * Test context
+ *==========================================================================*/
+
+typedef struct test_context {
+ const char* default_config_dir;
+ const char* default_config_file;
+ char* config_dir;
+ char* config_subdir;
+ char* config_file;
+} TestContext;
+
+static
+void
+test_context_init(
+ TestContext* test,
+ const char* prot)
+{
+ memset(test, 0, sizeof(*test));
+ test->default_config_dir = gbinder_config_dir;
+ test->default_config_file = gbinder_config_file;
+ test->config_dir = g_dir_make_tmp(TMP_DIR_TEMPLATE, NULL);
+ test->config_subdir = g_build_filename(test->config_dir, "d", NULL);
+ test->config_file = g_build_filename(test->config_dir, "test.conf", NULL);
+ gbinder_config_dir = test->config_subdir; /* Doesn't exist */
+ gbinder_config_file = test->config_file;
+ if (prot) {
+ char* config = g_strdup_printf("[Protocol]\n"
+ GBINDER_DEFAULT_BINDER " = %s", prot);
+
+ GDEBUG("Config file %s", test->config_file);
+ g_assert(g_file_set_contents(test->config_file, config, -1, NULL));
+ g_free(config);
+ }
+}
+
+static
+void
+test_context_deinit(
+ TestContext* test)
+{
+ remove(test->config_file);
+ remove(test->config_dir);
+ g_free(test->config_file);
+ g_free(test->config_subdir);
+ g_free(test->config_dir);
+ gbinder_config_dir = test->default_config_dir;
+ gbinder_config_file = test->default_config_file;
+ gbinder_config_exit();
+ gbinder_rpc_protocol_exit();
+}
/*==========================================================================*
* null
@@ -100,6 +174,7 @@
gbinder_writer_append_buffer_object(&writer, NULL, 0);
gbinder_writer_append_buffer_object_with_parent(NULL, NULL, 0, NULL);
gbinder_writer_append_buffer_object_with_parent(&writer, NULL, 0, NULL);
+ gbinder_writer_append_parcelable(NULL, NULL, 0);
gbinder_writer_append_local_object(NULL, NULL);
gbinder_writer_append_local_object(&writer, NULL);
gbinder_writer_append_remote_object(NULL, NULL);
@@ -146,7 +221,7 @@
test_cleanup(
void)
{
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderWriter writer;
const int value = 42;
const char* str = "foo";
@@ -180,7 +255,7 @@
const char encoded[] = {
TEST_INT8_BYTES_4(0x80)
};
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -207,7 +282,7 @@
const char encoded[] = {
TEST_INT16_BYTES_4(0x80ff)
};
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -232,7 +307,7 @@
void)
{
const guint32 value = 1234567;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -269,7 +344,7 @@
void)
{
const guint64 value = 12345678;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -293,7 +368,7 @@
void)
{
const gfloat value = 12345678;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -317,7 +392,7 @@
void)
{
const gdouble value = 12345678;
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -345,7 +420,7 @@
TEST_INT8_BYTES_4(1),
TEST_INT8_BYTES_4(1)
};
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -372,7 +447,7 @@
void)
{
const char value[] = { 0x01, 0x02, 0x03 };
- GBinderLocalRequest* req = gbinder_local_request_new(&gbinder_io_32, NULL);
+ GBinderLocalRequest* req = test_local_request_new();
GBinderOutputData* data;
GBinderWriter writer;
@@ -397,7 +472,7 @@
{
|
