Impl RPC with namomsg and namopb (IsLogin and GetSelfWxid)
This commit is contained in:
Changhua
parent
e775475962
commit
0a5f6cc8ec
@ -154,17 +154,22 @@
|
|||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\proto\wcf.grpc.pb.h" />
|
<ClInclude Include="..\rpc\nanopb\pb.h" />
|
||||||
<ClInclude Include="..\proto\wcf.pb.h" />
|
<ClInclude Include="..\rpc\nanopb\pb_common.h" />
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_decode.h" />
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_encode.h" />
|
||||||
|
<ClInclude Include="..\rpc\proto\wcf.pb.h" />
|
||||||
<ClInclude Include="..\sdk\sdk.h" />
|
<ClInclude Include="..\sdk\sdk.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\proto\wcf.grpc.pb.cc" />
|
<ClCompile Include="..\rpc\nanopb\pb_common.c" />
|
||||||
<ClCompile Include="..\proto\wcf.pb.cc" />
|
<ClCompile Include="..\rpc\nanopb\pb_decode.c" />
|
||||||
|
<ClCompile Include="..\rpc\nanopb\pb_encode.c" />
|
||||||
|
<ClCompile Include="..\rpc\proto\wcf.pb.c" />
|
||||||
<ClCompile Include="main.cpp" />
|
<ClCompile Include="main.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\proto\wcf.proto" />
|
<None Include="..\rpc\proto\wcf.proto" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
<ImportGroup Label="ExtensionTargets">
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
|||||||
@ -13,35 +13,50 @@
|
|||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter Include="proto">
|
<Filter Include="nnrpc">
|
||||||
<UniqueIdentifier>{0b2f5211-3264-4e9b-8f6d-9f2b51780156}</UniqueIdentifier>
|
<UniqueIdentifier>{985fabc8-364a-4c12-ac0a-b9386288565a}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\proto\wcf.grpc.pb.h">
|
|
||||||
<Filter>proto</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\proto\wcf.pb.h">
|
|
||||||
<Filter>proto</Filter>
|
|
||||||
</ClInclude>
|
|
||||||
<ClInclude Include="..\sdk\sdk.h">
|
<ClInclude Include="..\sdk\sdk.h">
|
||||||
<Filter>头文件</Filter>
|
<Filter>头文件</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_common.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_decode.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_encode.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\proto\wcf.pb.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="main.cpp">
|
<ClCompile Include="main.cpp">
|
||||||
<Filter>源文件</Filter>
|
<Filter>源文件</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\proto\wcf.grpc.pb.cc">
|
<ClCompile Include="..\rpc\nanopb\pb_common.c">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\proto\wcf.pb.cc">
|
<ClCompile Include="..\rpc\nanopb\pb_decode.c">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\rpc\nanopb\pb_encode.c">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\rpc\proto\wcf.pb.c">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\proto\wcf.proto">
|
<None Include="..\rpc\proto\wcf.proto">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -7,7 +7,7 @@ RPC Client
|
|||||||
#include <memory>
|
#include <memory>
|
||||||
#include <signal.h>
|
#include <signal.h>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
#if 0
|
||||||
#include <grpcpp/grpcpp.h>
|
#include <grpcpp/grpcpp.h>
|
||||||
|
|
||||||
#include "../proto/wcf.grpc.pb.h"
|
#include "../proto/wcf.grpc.pb.h"
|
||||||
@ -523,3 +523,5 @@ int main(int argc, char **argv)
|
|||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
int main() { return 0; }
|
||||||
|
|||||||
@ -1,88 +0,0 @@
|
|||||||
syntax = "proto3";
|
|
||||||
|
|
||||||
package wcf;
|
|
||||||
option java_package = "com.iamteer.wcf";
|
|
||||||
|
|
||||||
service Wcf {
|
|
||||||
rpc RpcIsLogin(Empty) returns (Response) {}
|
|
||||||
rpc RpcGetSelfWxid(Empty) returns (String) {}
|
|
||||||
rpc RpcEnableRecvMsg(Empty) returns (stream WxMsg) {}
|
|
||||||
rpc RpcDisableRecvMsg(Empty) returns (Response) {}
|
|
||||||
rpc RpcSendTextMsg(TextMsg) returns (Response) {}
|
|
||||||
rpc RpcSendImageMsg(ImageMsg) returns (Response) {}
|
|
||||||
rpc RpcGetMsgTypes(Empty) returns (MsgTypes) {}
|
|
||||||
rpc RpcGetContacts(Empty) returns (Contacts) {}
|
|
||||||
rpc RpcGetDbNames(Empty) returns (DbNames) {}
|
|
||||||
rpc RpcGetDbTables(String) returns (DbTables) {}
|
|
||||||
rpc RpcExecDbQuery(DbQuery) returns (DbRows) {}
|
|
||||||
rpc RpcAcceptNewFriend(Verification) returns (Response) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
message Empty {}
|
|
||||||
|
|
||||||
message WxMsg {
|
|
||||||
bool is_self = 1; // 是否自己发送的
|
|
||||||
bool is_group = 2; // 是否群消息
|
|
||||||
int32 type = 3; // 消息类型
|
|
||||||
string id = 4; // 消息 id
|
|
||||||
string xml = 5; // 消息 xml
|
|
||||||
string sender = 6; // 消息发送者
|
|
||||||
string roomid = 7; // 群 id（如果是群消息的话）
|
|
||||||
string content = 8; // 消息内容
|
|
||||||
}
|
|
||||||
|
|
||||||
message Response {
|
|
||||||
int32 status = 1; // 状态码
|
|
||||||
}
|
|
||||||
|
|
||||||
message TextMsg {
|
|
||||||
string msg = 1; // 要发送的消息内容
|
|
||||||
string receiver = 2; // 消息接收人，当为群时可@
|
|
||||||
string aters = 3; // 要@的人列表，逗号分隔
|
|
||||||
}
|
|
||||||
|
|
||||||
message ImageMsg {
|
|
||||||
string path = 1; // 要发送的图片的路径
|
|
||||||
string receiver = 2; // 消息接收人
|
|
||||||
}
|
|
||||||
|
|
||||||
message MsgTypes { map<int32, string> types = 1; }
|
|
||||||
|
|
||||||
message Contact {
|
|
||||||
string wxid = 1; // 微信 id
|
|
||||||
string code = 2; // 微信号
|
|
||||||
string name = 3; // 微信昵称
|
|
||||||
string country = 4; // 国家
|
|
||||||
string province = 5; // 省/州
|
|
||||||
string city = 6; // 城市
|
|
||||||
int32 gender = 7; // 性别
|
|
||||||
}
|
|
||||||
message Contacts { repeated Contact contacts = 1; }
|
|
||||||
|
|
||||||
message DbNames { repeated string names = 1; }
|
|
||||||
|
|
||||||
message String { string str = 1; }
|
|
||||||
|
|
||||||
message DbTable {
|
|
||||||
string name = 1; // 表名
|
|
||||||
string sql = 2; // 建表 SQL
|
|
||||||
}
|
|
||||||
message DbTables { repeated DbTable tables = 1; }
|
|
||||||
|
|
||||||
message DbQuery {
|
|
||||||
string db = 1; // 目标数据库
|
|
||||||
string sql = 2; // 查询 SQL
|
|
||||||
}
|
|
||||||
|
|
||||||
message DbField {
|
|
||||||
int32 type = 1; // 字段类型
|
|
||||||
string column = 2; // 字段名称
|
|
||||||
bytes content = 3; // 字段内容
|
|
||||||
}
|
|
||||||
message DbRow { repeated DbField fields = 1; }
|
|
||||||
message DbRows { repeated DbRow rows = 1; }
|
|
||||||
|
|
||||||
message Verification {
|
|
||||||
string v3 = 1;
|
|
||||||
string v4 = 2;
|
|
||||||
}
|
|
||||||
917
rpc/nanopb/pb.h
Normal file
917
rpc/nanopb/pb.h
Normal file
@ -0,0 +1,917 @@
|
|||||||
|
/* Common parts of the nanopb library. Most of these are quite low-level
|
||||||
|
* stuff. For the high-level interface, see pb_encode.h and pb_decode.h.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PB_H_INCLUDED
|
||||||
|
#define PB_H_INCLUDED
|
||||||
|
|
||||||
|
/*****************************************************************
|
||||||
|
* Nanopb compilation time options. You can change these here by *
|
||||||
|
* uncommenting the lines, or on the compiler command line. *
|
||||||
|
*****************************************************************/
|
||||||
|
|
||||||
|
/* Enable support for dynamically allocated fields */
|
||||||
|
#define PB_ENABLE_MALLOC 1
|
||||||
|
|
||||||
|
/* Define this if your CPU / compiler combination does not support
|
||||||
|
* unaligned memory access to packed structures. Note that packed
|
||||||
|
* structures are only used when requested in .proto options. */
|
||||||
|
/* #define PB_NO_PACKED_STRUCTS 1 */
|
||||||
|
|
||||||
|
/* Increase the number of required fields that are tracked.
|
||||||
|
* A compiler warning will tell if you need this. */
|
||||||
|
/* #define PB_MAX_REQUIRED_FIELDS 256 */
|
||||||
|
|
||||||
|
/* Add support for tag numbers > 65536 and fields larger than 65536 bytes. */
|
||||||
|
/* #define PB_FIELD_32BIT 1 */
|
||||||
|
|
||||||
|
/* Disable support for error messages in order to save some code space. */
|
||||||
|
/* #define PB_NO_ERRMSG 1 */
|
||||||
|
|
||||||
|
/* Disable support for custom streams (support only memory buffers). */
|
||||||
|
/* #define PB_BUFFER_ONLY 1 */
|
||||||
|
|
||||||
|
/* Disable support for 64-bit datatypes, for compilers without int64_t
|
||||||
|
or to save some code space. */
|
||||||
|
/* #define PB_WITHOUT_64BIT 1 */
|
||||||
|
|
||||||
|
/* Don't encode scalar arrays as packed. This is only to be used when
|
||||||
|
* the decoder on the receiving side cannot process packed scalar arrays.
|
||||||
|
* Such example is older protobuf.js. */
|
||||||
|
/* #define PB_ENCODE_ARRAYS_UNPACKED 1 */
|
||||||
|
|
||||||
|
/* Enable conversion of doubles to floats for platforms that do not
|
||||||
|
* support 64-bit doubles. Most commonly AVR. */
|
||||||
|
/* #define PB_CONVERT_DOUBLE_FLOAT 1 */
|
||||||
|
|
||||||
|
/* Check whether incoming strings are valid UTF-8 sequences. Slows down
|
||||||
|
* the string processing slightly and slightly increases code size. */
|
||||||
|
/* #define PB_VALIDATE_UTF8 1 */
|
||||||
|
|
||||||
|
/* This can be defined if the platform is little-endian and has 8-bit bytes.
|
||||||
|
* Normally it is automatically detected based on __BYTE_ORDER__ macro. */
|
||||||
|
/* #define PB_LITTLE_ENDIAN_8BIT 1 */
|
||||||
|
|
||||||
|
/* Configure static assert mechanism. Instead of changing these, set your
|
||||||
|
* compiler to C11 standard mode if possible. */
|
||||||
|
/* #define PB_C99_STATIC_ASSERT 1 */
|
||||||
|
/* #define PB_NO_STATIC_ASSERT 1 */
|
||||||
|
|
||||||
|
/******************************************************************
|
||||||
|
* You usually don't need to change anything below this line. *
|
||||||
|
* Feel free to look around and use the defined macros, though. *
|
||||||
|
******************************************************************/
|
||||||
|
|
||||||
|
|
||||||
|
/* Version of the nanopb library. Just in case you want to check it in
|
||||||
|
* your own program. */
|
||||||
|
#define NANOPB_VERSION "nanopb-0.4.8-dev"
|
||||||
|
|
||||||
|
/* Include all the system headers needed by nanopb. You will need the
|
||||||
|
* definitions of the following:
|
||||||
|
* - strlen, memcpy, memset functions
|
||||||
|
* - [u]int_least8_t, uint_fast8_t, [u]int_least16_t, [u]int32_t, [u]int64_t
|
||||||
|
* - size_t
|
||||||
|
* - bool
|
||||||
|
*
|
||||||
|
* If you don't have the standard header files, you can instead provide
|
||||||
|
* a custom header that defines or includes all this. In that case,
|
||||||
|
* define PB_SYSTEM_HEADER to the path of this file.
|
||||||
|
*/
|
||||||
|
#ifdef PB_SYSTEM_HEADER
|
||||||
|
#include PB_SYSTEM_HEADER
|
||||||
|
#else
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <stddef.h>
|
||||||
|
#include <stdbool.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <limits.h>
|
||||||
|
|
||||||
|
#ifdef PB_ENABLE_MALLOC
|
||||||
|
#include <stdlib.h>
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Macro for defining packed structures (compiler dependent).
|
||||||
|
* This just reduces memory requirements, but is not required.
|
||||||
|
*/
|
||||||
|
#if defined(PB_NO_PACKED_STRUCTS)
|
||||||
|
/* Disable struct packing */
|
||||||
|
# define PB_PACKED_STRUCT_START
|
||||||
|
# define PB_PACKED_STRUCT_END
|
||||||
|
# define pb_packed
|
||||||
|
#elif defined(__GNUC__) || defined(__clang__)
|
||||||
|
/* For GCC and clang */
|
||||||
|
# define PB_PACKED_STRUCT_START
|
||||||
|
# define PB_PACKED_STRUCT_END
|
||||||
|
# define pb_packed __attribute__((packed))
|
||||||
|
#elif defined(__ICCARM__) || defined(__CC_ARM)
|
||||||
|
/* For IAR ARM and Keil MDK-ARM compilers */
|
||||||
|
# define PB_PACKED_STRUCT_START _Pragma("pack(push, 1)")
|
||||||
|
# define PB_PACKED_STRUCT_END _Pragma("pack(pop)")
|
||||||
|
# define pb_packed
|
||||||
|
#elif defined(_MSC_VER) && (_MSC_VER >= 1500)
|
||||||
|
/* For Microsoft Visual C++ */
|
||||||
|
# define PB_PACKED_STRUCT_START __pragma(pack(push, 1))
|
||||||
|
# define PB_PACKED_STRUCT_END __pragma(pack(pop))
|
||||||
|
# define pb_packed
|
||||||
|
#else
|
||||||
|
/* Unknown compiler */
|
||||||
|
# define PB_PACKED_STRUCT_START
|
||||||
|
# define PB_PACKED_STRUCT_END
|
||||||
|
# define pb_packed
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Detect endianness */
|
||||||
|
#ifndef PB_LITTLE_ENDIAN_8BIT
|
||||||
|
#if ((defined(__BYTE_ORDER) && __BYTE_ORDER == __LITTLE_ENDIAN) || \
|
||||||
|
(defined(__BYTE_ORDER__) && __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \
|
||||||
|
defined(__LITTLE_ENDIAN__) || defined(__ARMEL__) || \
|
||||||
|
defined(__THUMBEL__) || defined(__AARCH64EL__) || defined(_MIPSEL) || \
|
||||||
|
defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM)) \
|
||||||
|
&& CHAR_BIT == 8
|
||||||
|
#define PB_LITTLE_ENDIAN_8BIT 1
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Handly macro for suppressing unreferenced-parameter compiler warnings. */
|
||||||
|
#ifndef PB_UNUSED
|
||||||
|
#define PB_UNUSED(x) (void)(x)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Harvard-architecture processors may need special attributes for storing
|
||||||
|
* field information in program memory. */
|
||||||
|
#ifndef PB_PROGMEM
|
||||||
|
#ifdef __AVR__
|
||||||
|
#include <avr/pgmspace.h>
|
||||||
|
#define PB_PROGMEM PROGMEM
|
||||||
|
#define PB_PROGMEM_READU32(x) pgm_read_dword(&x)
|
||||||
|
#else
|
||||||
|
#define PB_PROGMEM
|
||||||
|
#define PB_PROGMEM_READU32(x) (x)
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Compile-time assertion, used for checking compatible compilation options.
|
||||||
|
* If this does not work properly on your compiler, use
|
||||||
|
* #define PB_NO_STATIC_ASSERT to disable it.
|
||||||
|
*
|
||||||
|
* But before doing that, check carefully the error message / place where it
|
||||||
|
* comes from to see if the error has a real cause. Unfortunately the error
|
||||||
|
* message is not always very clear to read, but you can see the reason better
|
||||||
|
* in the place where the PB_STATIC_ASSERT macro was called.
|
||||||
|
*/
|
||||||
|
#ifndef PB_NO_STATIC_ASSERT
|
||||||
|
# ifndef PB_STATIC_ASSERT
|
||||||
|
# if defined(__ICCARM__)
|
||||||
|
/* IAR has static_assert keyword but no _Static_assert */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
|
||||||
|
# elif defined(_MSC_VER) && (!defined(__STDC_VERSION__) || __STDC_VERSION__ < 201112)
|
||||||
|
/* MSVC in C89 mode supports static_assert() keyword anyway */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
|
||||||
|
# elif defined(PB_C99_STATIC_ASSERT)
|
||||||
|
/* Classic negative-size-array static assert mechanism */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG) typedef char PB_STATIC_ASSERT_MSG(MSG, __LINE__, __COUNTER__)[(COND)?1:-1];
|
||||||
|
# define PB_STATIC_ASSERT_MSG(MSG, LINE, COUNTER) PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER)
|
||||||
|
# define PB_STATIC_ASSERT_MSG_(MSG, LINE, COUNTER) pb_static_assertion_##MSG##_##LINE##_##COUNTER
|
||||||
|
# elif defined(__cplusplus)
|
||||||
|
/* C++11 standard static_assert mechanism */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG) static_assert(COND,#MSG);
|
||||||
|
# else
|
||||||
|
/* C11 standard _Static_assert mechanism */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG) _Static_assert(COND,#MSG);
|
||||||
|
# endif
|
||||||
|
# endif
|
||||||
|
#else
|
||||||
|
/* Static asserts disabled by PB_NO_STATIC_ASSERT */
|
||||||
|
# define PB_STATIC_ASSERT(COND,MSG)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Test that PB_STATIC_ASSERT works
|
||||||
|
* If you get errors here, you may need to do one of these:
|
||||||
|
* - Enable C11 standard support in your compiler
|
||||||
|
* - Define PB_C99_STATIC_ASSERT to enable C99 standard support
|
||||||
|
* - Define PB_NO_STATIC_ASSERT to disable static asserts altogether
|
||||||
|
*/
|
||||||
|
PB_STATIC_ASSERT(1, STATIC_ASSERT_IS_NOT_WORKING)
|
||||||
|
|
||||||
|
/* Number of required fields to keep track of. */
|
||||||
|
#ifndef PB_MAX_REQUIRED_FIELDS
|
||||||
|
#define PB_MAX_REQUIRED_FIELDS 64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if PB_MAX_REQUIRED_FIELDS < 64
|
||||||
|
#error You should not lower PB_MAX_REQUIRED_FIELDS from the default value (64).
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PB_WITHOUT_64BIT
|
||||||
|
#ifdef PB_CONVERT_DOUBLE_FLOAT
|
||||||
|
/* Cannot use doubles without 64-bit types */
|
||||||
|
#undef PB_CONVERT_DOUBLE_FLOAT
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* List of possible field types. These are used in the autogenerated code.
|
||||||
|
* Least-significant 4 bits tell the scalar type
|
||||||
|
* Most-significant 4 bits specify repeated/required/packed etc.
|
||||||
|
*/
|
||||||
|
|
||||||
|
typedef uint_least8_t pb_type_t;
|
||||||
|
|
||||||
|
/**** Field data types ****/
|
||||||
|
|
||||||
|
/* Numeric types */
|
||||||
|
#define PB_LTYPE_BOOL 0x00U /* bool */
|
||||||
|
#define PB_LTYPE_VARINT 0x01U /* int32, int64, enum, bool */
|
||||||
|
#define PB_LTYPE_UVARINT 0x02U /* uint32, uint64 */
|
||||||
|
#define PB_LTYPE_SVARINT 0x03U /* sint32, sint64 */
|
||||||
|
#define PB_LTYPE_FIXED32 0x04U /* fixed32, sfixed32, float */
|
||||||
|
#define PB_LTYPE_FIXED64 0x05U /* fixed64, sfixed64, double */
|
||||||
|
|
||||||
|
/* Marker for last packable field type. */
|
||||||
|
#define PB_LTYPE_LAST_PACKABLE 0x05U
|
||||||
|
|
||||||
|
/* Byte array with pre-allocated buffer.
|
||||||
|
* data_size is the length of the allocated PB_BYTES_ARRAY structure. */
|
||||||
|
#define PB_LTYPE_BYTES 0x06U
|
||||||
|
|
||||||
|
/* String with pre-allocated buffer.
|
||||||
|
* data_size is the maximum length. */
|
||||||
|
#define PB_LTYPE_STRING 0x07U
|
||||||
|
|
||||||
|
/* Submessage
|
||||||
|
* submsg_fields is pointer to field descriptions */
|
||||||
|
#define PB_LTYPE_SUBMESSAGE 0x08U
|
||||||
|
|
||||||
|
/* Submessage with pre-decoding callback
|
||||||
|
* The pre-decoding callback is stored as pb_callback_t right before pSize.
|
||||||
|
* submsg_fields is pointer to field descriptions */
|
||||||
|
#define PB_LTYPE_SUBMSG_W_CB 0x09U
|
||||||
|
|
||||||
|
/* Extension pseudo-field
|
||||||
|
* The field contains a pointer to pb_extension_t */
|
||||||
|
#define PB_LTYPE_EXTENSION 0x0AU
|
||||||
|
|
||||||
|
/* Byte array with inline, pre-allocated byffer.
|
||||||
|
* data_size is the length of the inline, allocated buffer.
|
||||||
|
* This differs from PB_LTYPE_BYTES by defining the element as
|
||||||
|
* pb_byte_t[data_size] rather than pb_bytes_array_t. */
|
||||||
|
#define PB_LTYPE_FIXED_LENGTH_BYTES 0x0BU
|
||||||
|
|
||||||
|
/* Number of declared LTYPES */
|
||||||
|
#define PB_LTYPES_COUNT 0x0CU
|
||||||
|
#define PB_LTYPE_MASK 0x0FU
|
||||||
|
|
||||||
|
/**** Field repetition rules ****/
|
||||||
|
|
||||||
|
#define PB_HTYPE_REQUIRED 0x00U
|
||||||
|
#define PB_HTYPE_OPTIONAL 0x10U
|
||||||
|
#define PB_HTYPE_SINGULAR 0x10U
|
||||||
|
#define PB_HTYPE_REPEATED 0x20U
|
||||||
|
#define PB_HTYPE_FIXARRAY 0x20U
|
||||||
|
#define PB_HTYPE_ONEOF 0x30U
|
||||||
|
#define PB_HTYPE_MASK 0x30U
|
||||||
|
|
||||||
|
/**** Field allocation types ****/
|
||||||
|
|
||||||
|
#define PB_ATYPE_STATIC 0x00U
|
||||||
|
#define PB_ATYPE_POINTER 0x80U
|
||||||
|
#define PB_ATYPE_CALLBACK 0x40U
|
||||||
|
#define PB_ATYPE_MASK 0xC0U
|
||||||
|
|
||||||
|
#define PB_ATYPE(x) ((x) & PB_ATYPE_MASK)
|
||||||
|
#define PB_HTYPE(x) ((x) & PB_HTYPE_MASK)
|
||||||
|
#define PB_LTYPE(x) ((x) & PB_LTYPE_MASK)
|
||||||
|
#define PB_LTYPE_IS_SUBMSG(x) (PB_LTYPE(x) == PB_LTYPE_SUBMESSAGE || \
|
||||||
|
PB_LTYPE(x) == PB_LTYPE_SUBMSG_W_CB)
|
||||||
|
|
||||||
|
/* Data type used for storing sizes of struct fields
|
||||||
|
* and array counts.
|
||||||
|
*/
|
||||||
|
#if defined(PB_FIELD_32BIT)
|
||||||
|
typedef uint32_t pb_size_t;
|
||||||
|
typedef int32_t pb_ssize_t;
|
||||||
|
#else
|
||||||
|
typedef uint_least16_t pb_size_t;
|
||||||
|
typedef int_least16_t pb_ssize_t;
|
||||||
|
#endif
|
||||||
|
#define PB_SIZE_MAX ((pb_size_t)-1)
|
||||||
|
|
||||||
|
/* Data type for storing encoded data and other byte streams.
|
||||||
|
* This typedef exists to support platforms where uint8_t does not exist.
|
||||||
|
* You can regard it as equivalent on uint8_t on other platforms.
|
||||||
|
*/
|
||||||
|
typedef uint_least8_t pb_byte_t;
|
||||||
|
|
||||||
|
/* Forward declaration of struct types */
|
||||||
|
typedef struct pb_istream_s pb_istream_t;
|
||||||
|
typedef struct pb_ostream_s pb_ostream_t;
|
||||||
|
typedef struct pb_field_iter_s pb_field_iter_t;
|
||||||
|
|
||||||
|
/* This structure is used in auto-generated constants
|
||||||
|
* to specify struct fields.
|
||||||
|
*/
|
||||||
|
typedef struct pb_msgdesc_s pb_msgdesc_t;
|
||||||
|
struct pb_msgdesc_s {
|
||||||
|
const uint32_t *field_info;
|
||||||
|
const pb_msgdesc_t * const * submsg_info;
|
||||||
|
const pb_byte_t *default_value;
|
||||||
|
|
||||||
|
bool (*field_callback)(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_iter_t *field);
|
||||||
|
|
||||||
|
pb_size_t field_count;
|
||||||
|
pb_size_t required_field_count;
|
||||||
|
pb_size_t largest_tag;
|
||||||
|
};
|
||||||
|
|
||||||
|
/* Iterator for message descriptor */
|
||||||
|
struct pb_field_iter_s {
|
||||||
|
const pb_msgdesc_t *descriptor; /* Pointer to message descriptor constant */
|
||||||
|
void *message; /* Pointer to start of the structure */
|
||||||
|
|
||||||
|
pb_size_t index; /* Index of the field */
|
||||||
|
pb_size_t field_info_index; /* Index to descriptor->field_info array */
|
||||||
|
pb_size_t required_field_index; /* Index that counts only the required fields */
|
||||||
|
pb_size_t submessage_index; /* Index that counts only submessages */
|
||||||
|
|
||||||
|
pb_size_t tag; /* Tag of current field */
|
||||||
|
pb_size_t data_size; /* sizeof() of a single item */
|
||||||
|
pb_size_t array_size; /* Number of array entries */
|
||||||
|
pb_type_t type; /* Type of current field */
|
||||||
|
|
||||||
|
void *pField; /* Pointer to current field in struct */
|
||||||
|
void *pData; /* Pointer to current data contents. Different than pField for arrays and pointers. */
|
||||||
|
void *pSize; /* Pointer to count/has field */
|
||||||
|
|
||||||
|
const pb_msgdesc_t *submsg_desc; /* For submessage fields, pointer to field descriptor for the submessage. */
|
||||||
|
};
|
||||||
|
|
||||||
|
/* For compatibility with legacy code */
|
||||||
|
typedef pb_field_iter_t pb_field_t;
|
||||||
|
|
||||||
|
/* Make sure that the standard integer types are of the expected sizes.
|
||||||
|
* Otherwise fixed32/fixed64 fields can break.
|
||||||
|
*
|
||||||
|
* If you get errors here, it probably means that your stdint.h is not
|
||||||
|
* correct for your platform.
|
||||||
|
*/
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
PB_STATIC_ASSERT(sizeof(int64_t) == 2 * sizeof(int32_t), INT64_T_WRONG_SIZE)
|
||||||
|
PB_STATIC_ASSERT(sizeof(uint64_t) == 2 * sizeof(uint32_t), UINT64_T_WRONG_SIZE)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This structure is used for 'bytes' arrays.
|
||||||
|
* It has the number of bytes in the beginning, and after that an array.
|
||||||
|
* Note that actual structs used will have a different length of bytes array.
|
||||||
|
*/
|
||||||
|
#define PB_BYTES_ARRAY_T(n) struct { pb_size_t size; pb_byte_t bytes[n]; }
|
||||||
|
#define PB_BYTES_ARRAY_T_ALLOCSIZE(n) ((size_t)n + offsetof(pb_bytes_array_t, bytes))
|
||||||
|
|
||||||
|
struct pb_bytes_array_s {
|
||||||
|
pb_size_t size;
|
||||||
|
pb_byte_t bytes[1];
|
||||||
|
};
|
||||||
|
typedef struct pb_bytes_array_s pb_bytes_array_t;
|
||||||
|
|
||||||
|
/* This structure is used for giving the callback function.
|
||||||
|
* It is stored in the message structure and filled in by the method that
|
||||||
|
* calls pb_decode.
|
||||||
|
*
|
||||||
|
* The decoding callback will be given a limited-length stream
|
||||||
|
* If the wire type was string, the length is the length of the string.
|
||||||
|
* If the wire type was a varint/fixed32/fixed64, the length is the length
|
||||||
|
* of the actual value.
|
||||||
|
* The function may be called multiple times (especially for repeated types,
|
||||||
|
* but also otherwise if the message happens to contain the field multiple
|
||||||
|
* times.)
|
||||||
|
*
|
||||||
|
* The encoding callback will receive the actual output stream.
|
||||||
|
* It should write all the data in one call, including the field tag and
|
||||||
|
* wire type. It can write multiple fields.
|
||||||
|
*
|
||||||
|
* The callback can be null if you want to skip a field.
|
||||||
|
*/
|
||||||
|
typedef struct pb_callback_s pb_callback_t;
|
||||||
|
struct pb_callback_s {
|
||||||
|
/* Callback functions receive a pointer to the arg field.
|
||||||
|
* You can access the value of the field as *arg, and modify it if needed.
|
||||||
|
*/
|
||||||
|
union {
|
||||||
|
bool (*decode)(pb_istream_t *stream, const pb_field_t *field, void **arg);
|
||||||
|
bool (*encode)(pb_ostream_t *stream, const pb_field_t *field, void * const *arg);
|
||||||
|
} funcs;
|
||||||
|
|
||||||
|
/* Free arg for use by callback */
|
||||||
|
void *arg;
|
||||||
|
};
|
||||||
|
|
||||||
|
extern bool pb_default_field_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field);
|
||||||
|
|
||||||
|
/* Wire types. Library user needs these only in encoder callbacks. */
|
||||||
|
typedef enum {
|
||||||
|
PB_WT_VARINT = 0,
|
||||||
|
PB_WT_64BIT = 1,
|
||||||
|
PB_WT_STRING = 2,
|
||||||
|
PB_WT_32BIT = 5,
|
||||||
|
PB_WT_PACKED = 255 /* PB_WT_PACKED is internal marker for packed arrays. */
|
||||||
|
} pb_wire_type_t;
|
||||||
|
|
||||||
|
/* Structure for defining the handling of unknown/extension fields.
|
||||||
|
* Usually the pb_extension_type_t structure is automatically generated,
|
||||||
|
* while the pb_extension_t structure is created by the user. However,
|
||||||
|
* if you want to catch all unknown fields, you can also create a custom
|
||||||
|
* pb_extension_type_t with your own callback.
|
||||||
|
*/
|
||||||
|
typedef struct pb_extension_type_s pb_extension_type_t;
|
||||||
|
typedef struct pb_extension_s pb_extension_t;
|
||||||
|
struct pb_extension_type_s {
|
||||||
|
/* Called for each unknown field in the message.
|
||||||
|
* If you handle the field, read off all of its data and return true.
|
||||||
|
* If you do not handle the field, do not read anything and return true.
|
||||||
|
* If you run into an error, return false.
|
||||||
|
* Set to NULL for default handler.
|
||||||
|
*/
|
||||||
|
bool (*decode)(pb_istream_t *stream, pb_extension_t *extension,
|
||||||
|
uint32_t tag, pb_wire_type_t wire_type);
|
||||||
|
|
||||||
|
/* Called once after all regular fields have been encoded.
|
||||||
|
* If you have something to write, do so and return true.
|
||||||
|
* If you do not have anything to write, just return true.
|
||||||
|
* If you run into an error, return false.
|
||||||
|
* Set to NULL for default handler.
|
||||||
|
*/
|
||||||
|
bool (*encode)(pb_ostream_t *stream, const pb_extension_t *extension);
|
||||||
|
|
||||||
|
/* Free field for use by the callback. */
|
||||||
|
const void *arg;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct pb_extension_s {
|
||||||
|
/* Type describing the extension field. Usually you'll initialize
|
||||||
|
* this to a pointer to the automatically generated structure. */
|
||||||
|
const pb_extension_type_t *type;
|
||||||
|
|
||||||
|
/* Destination for the decoded data. This must match the datatype
|
||||||
|
* of the extension field. */
|
||||||
|
void *dest;
|
||||||
|
|
||||||
|
/* Pointer to the next extension handler, or NULL.
|
||||||
|
* If this extension does not match a field, the next handler is
|
||||||
|
* automatically called. */
|
||||||
|
pb_extension_t *next;
|
||||||
|
|
||||||
|
/* The decoder sets this to true if the extension was found.
|
||||||
|
* Ignored for encoding. */
|
||||||
|
bool found;
|
||||||
|
};
|
||||||
|
|
||||||
|
#define pb_extension_init_zero {NULL,NULL,NULL,false}
|
||||||
|
|
||||||
|
/* Memory allocation functions to use. You can define pb_realloc and
|
||||||
|
* pb_free to custom functions if you want. */
|
||||||
|
#ifdef PB_ENABLE_MALLOC
|
||||||
|
# ifndef pb_realloc
|
||||||
|
# define pb_realloc(ptr, size) realloc(ptr, size)
|
||||||
|
# endif
|
||||||
|
# ifndef pb_free
|
||||||
|
# define pb_free(ptr) free(ptr)
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* This is used to inform about need to regenerate .pb.h/.pb.c files. */
|
||||||
|
#define PB_PROTO_HEADER_VERSION 40
|
||||||
|
|
||||||
|
/* These macros are used to declare pb_field_t's in the constant array. */
|
||||||
|
/* Size of a structure member, in bytes. */
|
||||||
|
#define pb_membersize(st, m) (sizeof ((st*)0)->m)
|
||||||
|
/* Number of entries in an array. */
|
||||||
|
#define pb_arraysize(st, m) (pb_membersize(st, m) / pb_membersize(st, m[0]))
|
||||||
|
/* Delta from start of one member to the start of another member. */
|
||||||
|
#define pb_delta(st, m1, m2) ((int)offsetof(st, m1) - (int)offsetof(st, m2))
|
||||||
|
|
||||||
|
/* Force expansion of macro value */
|
||||||
|
#define PB_EXPAND(x) x
|
||||||
|
|
||||||
|
/* Binding of a message field set into a specific structure */
|
||||||
|
#define PB_BIND(msgname, structname, width) \
|
||||||
|
const uint32_t structname ## _field_info[] PB_PROGMEM = \
|
||||||
|
{ \
|
||||||
|
msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ ## width, structname) \
|
||||||
|
0 \
|
||||||
|
}; \
|
||||||
|
const pb_msgdesc_t* const structname ## _submsg_info[] = \
|
||||||
|
{ \
|
||||||
|
msgname ## _FIELDLIST(PB_GEN_SUBMSG_INFO, structname) \
|
||||||
|
NULL \
|
||||||
|
}; \
|
||||||
|
const pb_msgdesc_t structname ## _msg = \
|
||||||
|
{ \
|
||||||
|
structname ## _field_info, \
|
||||||
|
structname ## _submsg_info, \
|
||||||
|
msgname ## _DEFAULT, \
|
||||||
|
msgname ## _CALLBACK, \
|
||||||
|
0 msgname ## _FIELDLIST(PB_GEN_FIELD_COUNT, structname), \
|
||||||
|
0 msgname ## _FIELDLIST(PB_GEN_REQ_FIELD_COUNT, structname), \
|
||||||
|
0 msgname ## _FIELDLIST(PB_GEN_LARGEST_TAG, structname), \
|
||||||
|
}; \
|
||||||
|
msgname ## _FIELDLIST(PB_GEN_FIELD_INFO_ASSERT_ ## width, structname)
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) +1
|
||||||
|
#define PB_GEN_REQ_FIELD_COUNT(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
+ (PB_HTYPE_ ## htype == PB_HTYPE_REQUIRED)
|
||||||
|
#define PB_GEN_LARGEST_TAG(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
* 0 + tag
|
||||||
|
|
||||||
|
/* X-macro for generating the entries in struct_field_info[] array. */
|
||||||
|
#define PB_GEN_FIELD_INFO_1(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_2(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_4(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_8(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_AUTO(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
|
||||||
|
tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_FIELDINFO_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
|
||||||
|
|
||||||
|
/* X-macro for generating asserts that entries fit in struct_field_info[] array.
|
||||||
|
* The structure of macros here must match the structure above in PB_GEN_FIELD_INFO_x(),
|
||||||
|
* but it is not easily reused because of how macro substitutions work. */
|
||||||
|
#define PB_GEN_FIELD_INFO_ASSERT_1(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_ASSERT_1(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_ASSERT_2(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_ASSERT_2(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_ASSERT_4(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_ASSERT_4(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_ASSERT_8(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_ASSERT_8(tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_GEN_FIELD_INFO_ASSERT_AUTO(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_FIELDINFO_ASSERT_AUTO2(PB_FIELDINFO_WIDTH_AUTO(_PB_ATYPE_ ## atype, _PB_HTYPE_ ## htype, _PB_LTYPE_ ## ltype), \
|
||||||
|
tag, PB_ATYPE_ ## atype | PB_HTYPE_ ## htype | PB_LTYPE_MAP_ ## ltype, \
|
||||||
|
PB_DATA_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_DATA_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_SIZE_OFFSET_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname), \
|
||||||
|
PB_ARRAY_SIZE_ ## atype(_PB_HTYPE_ ## htype, structname, fieldname))
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_ASSERT_AUTO2(width, tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size)
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_ASSERT_AUTO3(width, tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_FIELDINFO_ASSERT_ ## width(tag, type, data_offset, data_size, size_offset, array_size)
|
||||||
|
|
||||||
|
#define PB_DATA_OFFSET_STATIC(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
|
||||||
|
#define PB_DATA_OFFSET_POINTER(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
|
||||||
|
#define PB_DATA_OFFSET_CALLBACK(htype, structname, fieldname) PB_DO ## htype(structname, fieldname)
|
||||||
|
#define PB_DO_PB_HTYPE_REQUIRED(structname, fieldname) offsetof(structname, fieldname)
|
||||||
|
#define PB_DO_PB_HTYPE_SINGULAR(structname, fieldname) offsetof(structname, fieldname)
|
||||||
|
#define PB_DO_PB_HTYPE_ONEOF(structname, fieldname) offsetof(structname, PB_ONEOF_NAME(FULL, fieldname))
|
||||||
|
#define PB_DO_PB_HTYPE_OPTIONAL(structname, fieldname) offsetof(structname, fieldname)
|
||||||
|
#define PB_DO_PB_HTYPE_REPEATED(structname, fieldname) offsetof(structname, fieldname)
|
||||||
|
#define PB_DO_PB_HTYPE_FIXARRAY(structname, fieldname) offsetof(structname, fieldname)
|
||||||
|
|
||||||
|
#define PB_SIZE_OFFSET_STATIC(htype, structname, fieldname) PB_SO ## htype(structname, fieldname)
|
||||||
|
#define PB_SIZE_OFFSET_POINTER(htype, structname, fieldname) PB_SO_PTR ## htype(structname, fieldname)
|
||||||
|
#define PB_SIZE_OFFSET_CALLBACK(htype, structname, fieldname) PB_SO_CB ## htype(structname, fieldname)
|
||||||
|
#define PB_SO_PB_HTYPE_REQUIRED(structname, fieldname) 0
|
||||||
|
#define PB_SO_PB_HTYPE_SINGULAR(structname, fieldname) 0
|
||||||
|
#define PB_SO_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF2(structname, PB_ONEOF_NAME(FULL, fieldname), PB_ONEOF_NAME(UNION, fieldname))
|
||||||
|
#define PB_SO_PB_HTYPE_ONEOF2(structname, fullname, unionname) PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname)
|
||||||
|
#define PB_SO_PB_HTYPE_ONEOF3(structname, fullname, unionname) pb_delta(structname, fullname, which_ ## unionname)
|
||||||
|
#define PB_SO_PB_HTYPE_OPTIONAL(structname, fieldname) pb_delta(structname, fieldname, has_ ## fieldname)
|
||||||
|
#define PB_SO_PB_HTYPE_REPEATED(structname, fieldname) pb_delta(structname, fieldname, fieldname ## _count)
|
||||||
|
#define PB_SO_PB_HTYPE_FIXARRAY(structname, fieldname) 0
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_REQUIRED(structname, fieldname) 0
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_SINGULAR(structname, fieldname) 0
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF(structname, fieldname)
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) 0
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_REPEATED(structname, fieldname) PB_SO_PB_HTYPE_REPEATED(structname, fieldname)
|
||||||
|
#define PB_SO_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) 0
|
||||||
|
#define PB_SO_CB_PB_HTYPE_REQUIRED(structname, fieldname) 0
|
||||||
|
#define PB_SO_CB_PB_HTYPE_SINGULAR(structname, fieldname) 0
|
||||||
|
#define PB_SO_CB_PB_HTYPE_ONEOF(structname, fieldname) PB_SO_PB_HTYPE_ONEOF(structname, fieldname)
|
||||||
|
#define PB_SO_CB_PB_HTYPE_OPTIONAL(structname, fieldname) 0
|
||||||
|
#define PB_SO_CB_PB_HTYPE_REPEATED(structname, fieldname) 0
|
||||||
|
#define PB_SO_CB_PB_HTYPE_FIXARRAY(structname, fieldname) 0
|
||||||
|
|
||||||
|
#define PB_ARRAY_SIZE_STATIC(htype, structname, fieldname) PB_AS ## htype(structname, fieldname)
|
||||||
|
#define PB_ARRAY_SIZE_POINTER(htype, structname, fieldname) PB_AS_PTR ## htype(structname, fieldname)
|
||||||
|
#define PB_ARRAY_SIZE_CALLBACK(htype, structname, fieldname) 1
|
||||||
|
#define PB_AS_PB_HTYPE_REQUIRED(structname, fieldname) 1
|
||||||
|
#define PB_AS_PB_HTYPE_SINGULAR(structname, fieldname) 1
|
||||||
|
#define PB_AS_PB_HTYPE_OPTIONAL(structname, fieldname) 1
|
||||||
|
#define PB_AS_PB_HTYPE_ONEOF(structname, fieldname) 1
|
||||||
|
#define PB_AS_PB_HTYPE_REPEATED(structname, fieldname) pb_arraysize(structname, fieldname)
|
||||||
|
#define PB_AS_PB_HTYPE_FIXARRAY(structname, fieldname) pb_arraysize(structname, fieldname)
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_REQUIRED(structname, fieldname) 1
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_SINGULAR(structname, fieldname) 1
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) 1
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_ONEOF(structname, fieldname) 1
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_REPEATED(structname, fieldname) 1
|
||||||
|
#define PB_AS_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) pb_arraysize(structname, fieldname[0])
|
||||||
|
|
||||||
|
#define PB_DATA_SIZE_STATIC(htype, structname, fieldname) PB_DS ## htype(structname, fieldname)
|
||||||
|
#define PB_DATA_SIZE_POINTER(htype, structname, fieldname) PB_DS_PTR ## htype(structname, fieldname)
|
||||||
|
#define PB_DATA_SIZE_CALLBACK(htype, structname, fieldname) PB_DS_CB ## htype(structname, fieldname)
|
||||||
|
#define PB_DS_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname))
|
||||||
|
#define PB_DS_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname)[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname[0])
|
||||||
|
#define PB_DS_PTR_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname[0][0])
|
||||||
|
#define PB_DS_CB_PB_HTYPE_REQUIRED(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_CB_PB_HTYPE_SINGULAR(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_CB_PB_HTYPE_OPTIONAL(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_CB_PB_HTYPE_ONEOF(structname, fieldname) pb_membersize(structname, PB_ONEOF_NAME(FULL, fieldname))
|
||||||
|
#define PB_DS_CB_PB_HTYPE_REPEATED(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
#define PB_DS_CB_PB_HTYPE_FIXARRAY(structname, fieldname) pb_membersize(structname, fieldname)
|
||||||
|
|
||||||
|
#define PB_ONEOF_NAME(type, tuple) PB_EXPAND(PB_ONEOF_NAME_ ## type tuple)
|
||||||
|
#define PB_ONEOF_NAME_UNION(unionname,membername,fullname) unionname
|
||||||
|
#define PB_ONEOF_NAME_MEMBER(unionname,membername,fullname) membername
|
||||||
|
#define PB_ONEOF_NAME_FULL(unionname,membername,fullname) fullname
|
||||||
|
|
||||||
|
#define PB_GEN_SUBMSG_INFO(structname, atype, htype, ltype, fieldname, tag) \
|
||||||
|
PB_SUBMSG_INFO_ ## htype(_PB_LTYPE_ ## ltype, structname, fieldname)
|
||||||
|
|
||||||
|
#define PB_SUBMSG_INFO_REQUIRED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
|
||||||
|
#define PB_SUBMSG_INFO_SINGULAR(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
|
||||||
|
#define PB_SUBMSG_INFO_OPTIONAL(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
|
||||||
|
#define PB_SUBMSG_INFO_ONEOF(ltype, structname, fieldname) PB_SUBMSG_INFO_ONEOF2(ltype, structname, PB_ONEOF_NAME(UNION, fieldname), PB_ONEOF_NAME(MEMBER, fieldname))
|
||||||
|
#define PB_SUBMSG_INFO_ONEOF2(ltype, structname, unionname, membername) PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername)
|
||||||
|
#define PB_SUBMSG_INFO_ONEOF3(ltype, structname, unionname, membername) PB_SI ## ltype(structname ## _ ## unionname ## _ ## membername ## _MSGTYPE)
|
||||||
|
#define PB_SUBMSG_INFO_REPEATED(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
|
||||||
|
#define PB_SUBMSG_INFO_FIXARRAY(ltype, structname, fieldname) PB_SI ## ltype(structname ## _ ## fieldname ## _MSGTYPE)
|
||||||
|
#define PB_SI_PB_LTYPE_BOOL(t)
|
||||||
|
#define PB_SI_PB_LTYPE_BYTES(t)
|
||||||
|
#define PB_SI_PB_LTYPE_DOUBLE(t)
|
||||||
|
#define PB_SI_PB_LTYPE_ENUM(t)
|
||||||
|
#define PB_SI_PB_LTYPE_UENUM(t)
|
||||||
|
#define PB_SI_PB_LTYPE_FIXED32(t)
|
||||||
|
#define PB_SI_PB_LTYPE_FIXED64(t)
|
||||||
|
#define PB_SI_PB_LTYPE_FLOAT(t)
|
||||||
|
#define PB_SI_PB_LTYPE_INT32(t)
|
||||||
|
#define PB_SI_PB_LTYPE_INT64(t)
|
||||||
|
#define PB_SI_PB_LTYPE_MESSAGE(t) PB_SUBMSG_DESCRIPTOR(t)
|
||||||
|
#define PB_SI_PB_LTYPE_MSG_W_CB(t) PB_SUBMSG_DESCRIPTOR(t)
|
||||||
|
#define PB_SI_PB_LTYPE_SFIXED32(t)
|
||||||
|
#define PB_SI_PB_LTYPE_SFIXED64(t)
|
||||||
|
#define PB_SI_PB_LTYPE_SINT32(t)
|
||||||
|
#define PB_SI_PB_LTYPE_SINT64(t)
|
||||||
|
#define PB_SI_PB_LTYPE_STRING(t)
|
||||||
|
#define PB_SI_PB_LTYPE_UINT32(t)
|
||||||
|
#define PB_SI_PB_LTYPE_UINT64(t)
|
||||||
|
#define PB_SI_PB_LTYPE_EXTENSION(t)
|
||||||
|
#define PB_SI_PB_LTYPE_FIXED_LENGTH_BYTES(t)
|
||||||
|
#define PB_SUBMSG_DESCRIPTOR(t) &(t ## _msg),
|
||||||
|
|
||||||
|
/* The field descriptors use a variable width format, with width of either
|
||||||
|
* 1, 2, 4 or 8 of 32-bit words. The two lowest bytes of the first byte always
|
||||||
|
* encode the descriptor size, 6 lowest bits of field tag number, and 8 bits
|
||||||
|
* of the field type.
|
||||||
|
*
|
||||||
|
* Descriptor size is encoded as 0 = 1 word, 1 = 2 words, 2 = 4 words, 3 = 8 words.
|
||||||
|
*
|
||||||
|
* Formats, listed starting with the least significant bit of the first word.
|
||||||
|
* 1 word: [2-bit len] [6-bit tag] [8-bit type] [8-bit data_offset] [4-bit size_offset] [4-bit data_size]
|
||||||
|
*
|
||||||
|
* 2 words: [2-bit len] [6-bit tag] [8-bit type] [12-bit array_size] [4-bit size_offset]
|
||||||
|
* [16-bit data_offset] [12-bit data_size] [4-bit tag>>6]
|
||||||
|
*
|
||||||
|
* 4 words: [2-bit len] [6-bit tag] [8-bit type] [16-bit array_size]
|
||||||
|
* [8-bit size_offset] [24-bit tag>>6]
|
||||||
|
* [32-bit data_offset]
|
||||||
|
* [32-bit data_size]
|
||||||
|
*
|
||||||
|
* 8 words: [2-bit len] [6-bit tag] [8-bit type] [16-bit reserved]
|
||||||
|
* [8-bit size_offset] [24-bit tag>>6]
|
||||||
|
* [32-bit data_offset]
|
||||||
|
* [32-bit data_size]
|
||||||
|
* [32-bit array_size]
|
||||||
|
* [32-bit reserved]
|
||||||
|
* [32-bit reserved]
|
||||||
|
* [32-bit reserved]
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_1(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
(0 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(data_offset) & 0xFF) << 16) | \
|
||||||
|
(((uint32_t)(size_offset) & 0x0F) << 24) | (((uint32_t)(data_size) & 0x0F) << 28)),
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_2(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
(1 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFF) << 16) | (((uint32_t)(size_offset) & 0x0F) << 28)), \
|
||||||
|
(((uint32_t)(data_offset) & 0xFFFF) | (((uint32_t)(data_size) & 0xFFF) << 16) | (((uint32_t)(tag) & 0x3c0) << 22)),
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_4(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
(2 | (((tag) << 2) & 0xFF) | ((type) << 8) | (((uint32_t)(array_size) & 0xFFFF) << 16)), \
|
||||||
|
((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
|
||||||
|
(data_offset), (data_size),
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_8(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
(3 | (((tag) << 2) & 0xFF) | ((type) << 8)), \
|
||||||
|
((uint32_t)(int_least8_t)(size_offset) | (((uint32_t)(tag) << 2) & 0xFFFFFF00)), \
|
||||||
|
(data_offset), (data_size), (array_size), 0, 0, 0,
|
||||||
|
|
||||||
|
/* These assertions verify that the field information fits in the allocated space.
|
||||||
|
* The generator tries to automatically determine the correct width that can fit all
|
||||||
|
* data associated with a message. These asserts will fail only if there has been a
|
||||||
|
* problem in the automatic logic - this may be worth reporting as a bug. As a workaround,
|
||||||
|
* you can increase the descriptor width by defining PB_FIELDINFO_WIDTH or by setting
|
||||||
|
* descriptorsize option in .options file.
|
||||||
|
*/
|
||||||
|
#define PB_FITS(value,bits) ((uint32_t)(value) < ((uint32_t)1<<bits))
|
||||||
|
#define PB_FIELDINFO_ASSERT_1(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,6) && PB_FITS(data_offset,8) && PB_FITS(size_offset,4) && PB_FITS(data_size,4) && PB_FITS(array_size,1), FIELDINFO_DOES_NOT_FIT_width1_field ## tag)
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_ASSERT_2(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,10) && PB_FITS(data_offset,16) && PB_FITS(size_offset,4) && PB_FITS(data_size,12) && PB_FITS(array_size,12), FIELDINFO_DOES_NOT_FIT_width2_field ## tag)
|
||||||
|
|
||||||
|
#ifndef PB_FIELD_32BIT
|
||||||
|
/* Maximum field sizes are still 16-bit if pb_size_t is 16-bit */
|
||||||
|
#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,16) && PB_FITS(data_offset,16) && PB_FITS((int_least8_t)size_offset,8) && PB_FITS(data_size,16) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
|
||||||
|
#else
|
||||||
|
/* Up to 32-bit fields supported.
|
||||||
|
* Note that the checks are against 31 bits to avoid compiler warnings about shift wider than type in the test.
|
||||||
|
* I expect that there is no reasonable use for >2GB messages with nanopb anyway.
|
||||||
|
*/
|
||||||
|
#define PB_FIELDINFO_ASSERT_4(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,16), FIELDINFO_DOES_NOT_FIT_width4_field ## tag)
|
||||||
|
|
||||||
|
#define PB_FIELDINFO_ASSERT_8(tag, type, data_offset, data_size, size_offset, array_size) \
|
||||||
|
PB_STATIC_ASSERT(PB_FITS(tag,30) && PB_FITS(data_offset,31) && PB_FITS(size_offset,8) && PB_FITS(data_size,31) && PB_FITS(array_size,31), FIELDINFO_DOES_NOT_FIT_width8_field ## tag)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
/* Automatic picking of FIELDINFO width:
|
||||||
|
* Uses width 1 when possible, otherwise resorts to width 2.
|
||||||
|
* This is used when PB_BIND() is called with "AUTO" as the argument.
|
||||||
|
* The generator will give explicit size argument when it knows that a message
|
||||||
|
* structure grows beyond 1-word format limits.
|
||||||
|
*/
|
||||||
|
#define PB_FIELDINFO_WIDTH_AUTO(atype, htype, ltype) PB_FI_WIDTH ## atype(htype, ltype)
|
||||||
|
#define PB_FI_WIDTH_PB_ATYPE_STATIC(htype, ltype) PB_FI_WIDTH ## htype(ltype)
|
||||||
|
#define PB_FI_WIDTH_PB_ATYPE_POINTER(htype, ltype) PB_FI_WIDTH ## htype(ltype)
|
||||||
|
#define PB_FI_WIDTH_PB_ATYPE_CALLBACK(htype, ltype) 2
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_REQUIRED(ltype) PB_FI_WIDTH ## ltype
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_SINGULAR(ltype) PB_FI_WIDTH ## ltype
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_OPTIONAL(ltype) PB_FI_WIDTH ## ltype
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_ONEOF(ltype) PB_FI_WIDTH ## ltype
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_REPEATED(ltype) 2
|
||||||
|
#define PB_FI_WIDTH_PB_HTYPE_FIXARRAY(ltype) 2
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_BOOL 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_BYTES 2
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_DOUBLE 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_ENUM 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_UENUM 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_FIXED32 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_FIXED64 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_FLOAT 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_INT32 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_INT64 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_MESSAGE 2
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_MSG_W_CB 2
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_SFIXED32 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_SFIXED64 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_SINT32 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_SINT64 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_STRING 2
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_UINT32 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_UINT64 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_EXTENSION 1
|
||||||
|
#define PB_FI_WIDTH_PB_LTYPE_FIXED_LENGTH_BYTES 2
|
||||||
|
|
||||||
|
/* The mapping from protobuf types to LTYPEs is done using these macros. */
|
||||||
|
#define PB_LTYPE_MAP_BOOL PB_LTYPE_BOOL
|
||||||
|
#define PB_LTYPE_MAP_BYTES PB_LTYPE_BYTES
|
||||||
|
#define PB_LTYPE_MAP_DOUBLE PB_LTYPE_FIXED64
|
||||||
|
#define PB_LTYPE_MAP_ENUM PB_LTYPE_VARINT
|
||||||
|
#define PB_LTYPE_MAP_UENUM PB_LTYPE_UVARINT
|
||||||
|
#define PB_LTYPE_MAP_FIXED32 PB_LTYPE_FIXED32
|
||||||
|
#define PB_LTYPE_MAP_FIXED64 PB_LTYPE_FIXED64
|
||||||
|
#define PB_LTYPE_MAP_FLOAT PB_LTYPE_FIXED32
|
||||||
|
#define PB_LTYPE_MAP_INT32 PB_LTYPE_VARINT
|
||||||
|
#define PB_LTYPE_MAP_INT64 PB_LTYPE_VARINT
|
||||||
|
#define PB_LTYPE_MAP_MESSAGE PB_LTYPE_SUBMESSAGE
|
||||||
|
#define PB_LTYPE_MAP_MSG_W_CB PB_LTYPE_SUBMSG_W_CB
|
||||||
|
#define PB_LTYPE_MAP_SFIXED32 PB_LTYPE_FIXED32
|
||||||
|
#define PB_LTYPE_MAP_SFIXED64 PB_LTYPE_FIXED64
|
||||||
|
#define PB_LTYPE_MAP_SINT32 PB_LTYPE_SVARINT
|
||||||
|
#define PB_LTYPE_MAP_SINT64 PB_LTYPE_SVARINT
|
||||||
|
#define PB_LTYPE_MAP_STRING PB_LTYPE_STRING
|
||||||
|
#define PB_LTYPE_MAP_UINT32 PB_LTYPE_UVARINT
|
||||||
|
#define PB_LTYPE_MAP_UINT64 PB_LTYPE_UVARINT
|
||||||
|
#define PB_LTYPE_MAP_EXTENSION PB_LTYPE_EXTENSION
|
||||||
|
#define PB_LTYPE_MAP_FIXED_LENGTH_BYTES PB_LTYPE_FIXED_LENGTH_BYTES
|
||||||
|
|
||||||
|
/* These macros are used for giving out error messages.
|
||||||
|
* They are mostly a debugging aid; the main error information
|
||||||
|
* is the true/false return value from functions.
|
||||||
|
* Some code space can be saved by disabling the error
|
||||||
|
* messages if not used.
|
||||||
|
*
|
||||||
|
* PB_SET_ERROR() sets the error message if none has been set yet.
|
||||||
|
* msg must be a constant string literal.
|
||||||
|
* PB_GET_ERROR() always returns a pointer to a string.
|
||||||
|
* PB_RETURN_ERROR() sets the error and returns false from current
|
||||||
|
* function.
|
||||||
|
*/
|
||||||
|
#ifdef PB_NO_ERRMSG
|
||||||
|
#define PB_SET_ERROR(stream, msg) PB_UNUSED(stream)
|
||||||
|
#define PB_GET_ERROR(stream) "(errmsg disabled)"
|
||||||
|
#else
|
||||||
|
#define PB_SET_ERROR(stream, msg) (stream->errmsg = (stream)->errmsg ? (stream)->errmsg : (msg))
|
||||||
|
#define PB_GET_ERROR(stream) ((stream)->errmsg ? (stream)->errmsg : "(none)")
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define PB_RETURN_ERROR(stream, msg) return PB_SET_ERROR(stream, msg), false
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
#if __cplusplus >= 201103L
|
||||||
|
#define PB_CONSTEXPR constexpr
|
||||||
|
#else // __cplusplus >= 201103L
|
||||||
|
#define PB_CONSTEXPR
|
||||||
|
#endif // __cplusplus >= 201103L
|
||||||
|
|
||||||
|
#if __cplusplus >= 201703L
|
||||||
|
#define PB_INLINE_CONSTEXPR inline constexpr
|
||||||
|
#else // __cplusplus >= 201703L
|
||||||
|
#define PB_INLINE_CONSTEXPR PB_CONSTEXPR
|
||||||
|
#endif // __cplusplus >= 201703L
|
||||||
|
|
||||||
|
extern "C++"
|
||||||
|
{
|
||||||
|
namespace nanopb {
|
||||||
|
// Each type will be partially specialized by the generator.
|
||||||
|
template <typename GenMessageT> struct MessageDescriptor;
|
||||||
|
} // namespace nanopb
|
||||||
|
}
|
||||||
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
|
#endif
|
||||||
388
rpc/nanopb/pb_common.c
Normal file
388
rpc/nanopb/pb_common.c
Normal file
@ -0,0 +1,388 @@
|
|||||||
|
/* pb_common.c: Common support functions for pb_encode.c and pb_decode.c.
|
||||||
|
*
|
||||||
|
* 2014 Petteri Aimonen <jpa@kapsi.fi>
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "pb_common.h"
|
||||||
|
|
||||||
|
static bool load_descriptor_values(pb_field_iter_t *iter)
|
||||||
|
{
|
||||||
|
uint32_t word0;
|
||||||
|
uint32_t data_offset;
|
||||||
|
int_least8_t size_offset;
|
||||||
|
|
||||||
|
if (iter->index >= iter->descriptor->field_count)
|
||||||
|
return false;
|
||||||
|
|
||||||
|
word0 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
|
||||||
|
iter->type = (pb_type_t)((word0 >> 8) & 0xFF);
|
||||||
|
|
||||||
|
switch(word0 & 3)
|
||||||
|
{
|
||||||
|
case 0: {
|
||||||
|
/* 1-word format */
|
||||||
|
iter->array_size = 1;
|
||||||
|
iter->tag = (pb_size_t)((word0 >> 2) & 0x3F);
|
||||||
|
size_offset = (int_least8_t)((word0 >> 24) & 0x0F);
|
||||||
|
data_offset = (word0 >> 16) & 0xFF;
|
||||||
|
iter->data_size = (pb_size_t)((word0 >> 28) & 0x0F);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 1: {
|
||||||
|
/* 2-word format */
|
||||||
|
uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
|
||||||
|
|
||||||
|
iter->array_size = (pb_size_t)((word0 >> 16) & 0x0FFF);
|
||||||
|
iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 28) << 6));
|
||||||
|
size_offset = (int_least8_t)((word0 >> 28) & 0x0F);
|
||||||
|
data_offset = word1 & 0xFFFF;
|
||||||
|
iter->data_size = (pb_size_t)((word1 >> 16) & 0x0FFF);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 2: {
|
||||||
|
/* 4-word format */
|
||||||
|
uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
|
||||||
|
uint32_t word2 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 2]);
|
||||||
|
uint32_t word3 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 3]);
|
||||||
|
|
||||||
|
iter->array_size = (pb_size_t)(word0 >> 16);
|
||||||
|
iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 8) << 6));
|
||||||
|
size_offset = (int_least8_t)(word1 & 0xFF);
|
||||||
|
data_offset = word2;
|
||||||
|
iter->data_size = (pb_size_t)word3;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
default: {
|
||||||
|
/* 8-word format */
|
||||||
|
uint32_t word1 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 1]);
|
||||||
|
uint32_t word2 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 2]);
|
||||||
|
uint32_t word3 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 3]);
|
||||||
|
uint32_t word4 = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index + 4]);
|
||||||
|
|
||||||
|
iter->array_size = (pb_size_t)word4;
|
||||||
|
iter->tag = (pb_size_t)(((word0 >> 2) & 0x3F) | ((word1 >> 8) << 6));
|
||||||
|
size_offset = (int_least8_t)(word1 & 0xFF);
|
||||||
|
data_offset = word2;
|
||||||
|
iter->data_size = (pb_size_t)word3;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!iter->message)
|
||||||
|
{
|
||||||
|
/* Avoid doing arithmetic on null pointers, it is undefined */
|
||||||
|
iter->pField = NULL;
|
||||||
|
iter->pSize = NULL;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
iter->pField = (char*)iter->message + data_offset;
|
||||||
|
|
||||||
|
if (size_offset)
|
||||||
|
{
|
||||||
|
iter->pSize = (char*)iter->pField - size_offset;
|
||||||
|
}
|
||||||
|
else if (PB_HTYPE(iter->type) == PB_HTYPE_REPEATED &&
|
||||||
|
(PB_ATYPE(iter->type) == PB_ATYPE_STATIC ||
|
||||||
|
PB_ATYPE(iter->type) == PB_ATYPE_POINTER))
|
||||||
|
{
|
||||||
|
/* Fixed count array */
|
||||||
|
iter->pSize = &iter->array_size;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
iter->pSize = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (PB_ATYPE(iter->type) == PB_ATYPE_POINTER && iter->pField != NULL)
|
||||||
|
{
|
||||||
|
iter->pData = *(void**)iter->pField;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
iter->pData = iter->pField;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (PB_LTYPE_IS_SUBMSG(iter->type))
|
||||||
|
{
|
||||||
|
iter->submsg_desc = iter->descriptor->submsg_info[iter->submessage_index];
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
iter->submsg_desc = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void advance_iterator(pb_field_iter_t *iter)
|
||||||
|
{
|
||||||
|
iter->index++;
|
||||||
|
|
||||||
|
if (iter->index >= iter->descriptor->field_count)
|
||||||
|
{
|
||||||
|
/* Restart */
|
||||||
|
iter->index = 0;
|
||||||
|
iter->field_info_index = 0;
|
||||||
|
iter->submessage_index = 0;
|
||||||
|
iter->required_field_index = 0;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
/* Increment indexes based on previous field type.
|
||||||
|
* All field info formats have the following fields:
|
||||||
|
* - lowest 2 bits tell the amount of words in the descriptor (2^n words)
|
||||||
|
* - bits 2..7 give the lowest bits of tag number.
|
||||||
|
* - bits 8..15 give the field type.
|
||||||
|
*/
|
||||||
|
uint32_t prev_descriptor = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
|
||||||
|
pb_type_t prev_type = (prev_descriptor >> 8) & 0xFF;
|
||||||
|
pb_size_t descriptor_len = (pb_size_t)(1 << (prev_descriptor & 3));
|
||||||
|
|
||||||
|
/* Add to fields.
|
||||||
|
* The cast to pb_size_t is needed to avoid -Wconversion warning.
|
||||||
|
* Because the data is is constants from generator, there is no danger of overflow.
|
||||||
|
*/
|
||||||
|
iter->field_info_index = (pb_size_t)(iter->field_info_index + descriptor_len);
|
||||||
|
iter->required_field_index = (pb_size_t)(iter->required_field_index + (PB_HTYPE(prev_type) == PB_HTYPE_REQUIRED));
|
||||||
|
iter->submessage_index = (pb_size_t)(iter->submessage_index + PB_LTYPE_IS_SUBMSG(prev_type));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_begin(pb_field_iter_t *iter, const pb_msgdesc_t *desc, void *message)
|
||||||
|
{
|
||||||
|
memset(iter, 0, sizeof(*iter));
|
||||||
|
|
||||||
|
iter->descriptor = desc;
|
||||||
|
iter->message = message;
|
||||||
|
|
||||||
|
return load_descriptor_values(iter);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_begin_extension(pb_field_iter_t *iter, pb_extension_t *extension)
|
||||||
|
{
|
||||||
|
const pb_msgdesc_t *msg = (const pb_msgdesc_t*)extension->type->arg;
|
||||||
|
bool status;
|
||||||
|
|
||||||
|
uint32_t word0 = PB_PROGMEM_READU32(msg->field_info[0]);
|
||||||
|
if (PB_ATYPE(word0 >> 8) == PB_ATYPE_POINTER)
|
||||||
|
{
|
||||||
|
/* For pointer extensions, the pointer is stored directly
|
||||||
|
* in the extension structure. This avoids having an extra
|
||||||
|
* indirection. */
|
||||||
|
status = pb_field_iter_begin(iter, msg, &extension->dest);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
status = pb_field_iter_begin(iter, msg, extension->dest);
|
||||||
|
}
|
||||||
|
|
||||||
|
iter->pSize = &extension->found;
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_next(pb_field_iter_t *iter)
|
||||||
|
{
|
||||||
|
advance_iterator(iter);
|
||||||
|
(void)load_descriptor_values(iter);
|
||||||
|
return iter->index != 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_find(pb_field_iter_t *iter, uint32_t tag)
|
||||||
|
{
|
||||||
|
if (iter->tag == tag)
|
||||||
|
{
|
||||||
|
return true; /* Nothing to do, correct field already. */
|
||||||
|
}
|
||||||
|
else if (tag > iter->descriptor->largest_tag)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pb_size_t start = iter->index;
|
||||||
|
uint32_t fieldinfo;
|
||||||
|
|
||||||
|
if (tag < iter->tag)
|
||||||
|
{
|
||||||
|
/* Fields are in tag number order, so we know that tag is between
|
||||||
|
* 0 and our start position. Setting index to end forces
|
||||||
|
* advance_iterator() call below to restart from beginning. */
|
||||||
|
iter->index = iter->descriptor->field_count;
|
||||||
|
}
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
/* Advance iterator but don't load values yet */
|
||||||
|
advance_iterator(iter);
|
||||||
|
|
||||||
|
/* Do fast check for tag number match */
|
||||||
|
fieldinfo = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
|
||||||
|
|
||||||
|
if (((fieldinfo >> 2) & 0x3F) == (tag & 0x3F))
|
||||||
|
{
|
||||||
|
/* Good candidate, check further */
|
||||||
|
(void)load_descriptor_values(iter);
|
||||||
|
|
||||||
|
if (iter->tag == tag &&
|
||||||
|
PB_LTYPE(iter->type) != PB_LTYPE_EXTENSION)
|
||||||
|
{
|
||||||
|
/* Found it */
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} while (iter->index != start);
|
||||||
|
|
||||||
|
/* Searched all the way back to start, and found nothing. */
|
||||||
|
(void)load_descriptor_values(iter);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_find_extension(pb_field_iter_t *iter)
|
||||||
|
{
|
||||||
|
if (PB_LTYPE(iter->type) == PB_LTYPE_EXTENSION)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
pb_size_t start = iter->index;
|
||||||
|
uint32_t fieldinfo;
|
||||||
|
|
||||||
|
do
|
||||||
|
{
|
||||||
|
/* Advance iterator but don't load values yet */
|
||||||
|
advance_iterator(iter);
|
||||||
|
|
||||||
|
/* Do fast check for field type */
|
||||||
|
fieldinfo = PB_PROGMEM_READU32(iter->descriptor->field_info[iter->field_info_index]);
|
||||||
|
|
||||||
|
if (PB_LTYPE((fieldinfo >> 8) & 0xFF) == PB_LTYPE_EXTENSION)
|
||||||
|
{
|
||||||
|
return load_descriptor_values(iter);
|
||||||
|
}
|
||||||
|
} while (iter->index != start);
|
||||||
|
|
||||||
|
/* Searched all the way back to start, and found nothing. */
|
||||||
|
(void)load_descriptor_values(iter);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *pb_const_cast(const void *p)
|
||||||
|
{
|
||||||
|
/* Note: this casts away const, in order to use the common field iterator
|
||||||
|
* logic for both encoding and decoding. The cast is done using union
|
||||||
|
* to avoid spurious compiler warnings. */
|
||||||
|
union {
|
||||||
|
void *p1;
|
||||||
|
const void *p2;
|
||||||
|
} t;
|
||||||
|
t.p2 = p;
|
||||||
|
return t.p1;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_begin_const(pb_field_iter_t *iter, const pb_msgdesc_t *desc, const void *message)
|
||||||
|
{
|
||||||
|
return pb_field_iter_begin(iter, desc, pb_const_cast(message));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_field_iter_begin_extension_const(pb_field_iter_t *iter, const pb_extension_t *extension)
|
||||||
|
{
|
||||||
|
return pb_field_iter_begin_extension(iter, (pb_extension_t*)pb_const_cast(extension));
|
||||||
|
}
|
||||||
|
|
||||||
|
bool pb_default_field_callback(pb_istream_t *istream, pb_ostream_t *ostream, const pb_field_t *field)
|
||||||
|
{
|
||||||
|
if (field->data_size == sizeof(pb_callback_t))
|
||||||
|
{
|
||||||
|
pb_callback_t *pCallback = (pb_callback_t*)field->pData;
|
||||||
|
|
||||||
|
if (pCallback != NULL)
|
||||||
|
{
|
||||||
|
if (istream != NULL && pCallback->funcs.decode != NULL)
|
||||||
|
{
|
||||||
|
return pCallback->funcs.decode(istream, field, &pCallback->arg);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ostream != NULL && pCallback->funcs.encode != NULL)
|
||||||
|
{
|
||||||
|
return pCallback->funcs.encode(ostream, field, &pCallback->arg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true; /* Success, but didn't do anything */
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef PB_VALIDATE_UTF8
|
||||||
|
|
||||||
|
/* This function checks whether a string is valid UTF-8 text.
|
||||||
|
*
|
||||||
|
* Algorithm is adapted from https://www.cl.cam.ac.uk/~mgk25/ucs/utf8_check.c
|
||||||
|
* Original copyright: Markus Kuhn <http://www.cl.cam.ac.uk/~mgk25/> 2005-03-30
|
||||||
|
* Licensed under "Short code license", which allows use under MIT license or
|
||||||
|
* any compatible with it.
|
||||||
|
*/
|
||||||
|
|
||||||
|
bool pb_validate_utf8(const char *str)
|
||||||
|
{
|
||||||
|
const pb_byte_t *s = (const pb_byte_t*)str;
|
||||||
|
while (*s)
|
||||||
|
{
|
||||||
|
if (*s < 0x80)
|
||||||
|
{
|
||||||
|
/* 0xxxxxxx */
|
||||||
|
s++;
|
||||||
|
}
|
||||||
|
else if ((s[0] & 0xe0) == 0xc0)
|
||||||
|
{
|
||||||
|
/* 110XXXXx 10xxxxxx */
|
||||||
|
if ((s[1] & 0xc0) != 0x80 ||
|
||||||
|
(s[0] & 0xfe) == 0xc0) /* overlong? */
|
||||||
|
return false;
|
||||||
|
else
|
||||||
|
s += 2;
|
||||||
|
}
|
||||||
|
else if ((s[0] & 0xf0) == 0xe0)
|
||||||
|
{
|
||||||
|
/* 1110XXXX 10Xxxxxx 10xxxxxx */
|
||||||
|
if ((s[1] & 0xc0) != 0x80 ||
|
||||||
|
(s[2] & 0xc0) != 0x80 ||
|
||||||
|
(s[0] == 0xe0 && (s[1] & 0xe0) == 0x80) || /* overlong? */
|
||||||
|
(s[0] == 0xed && (s[1] & 0xe0) == 0xa0) || /* surrogate? */
|
||||||
|
(s[0] == 0xef && s[1] == 0xbf &&
|
||||||
|
(s[2] & 0xfe) == 0xbe)) /* U+FFFE or U+FFFF? */
|
||||||
|
return false;
|
||||||
|
else
|
||||||
|
s += 3;
|
||||||
|
}
|
||||||
|
else if ((s[0] & 0xf8) == 0xf0)
|
||||||
|
{
|
||||||
|
/* 11110XXX 10XXxxxx 10xxxxxx 10xxxxxx */
|
||||||
|
if ((s[1] & 0xc0) != 0x80 ||
|
||||||
|
(s[2] & 0xc0) != 0x80 ||
|
||||||
|
(s[3] & 0xc0) != 0x80 ||
|
||||||
|
(s[0] == 0xf0 && (s[1] & 0xf0) == 0x80) || /* overlong? */
|
||||||
|
(s[0] == 0xf4 && s[1] > 0x8f) || s[0] > 0xf4) /* > U+10FFFF? */
|
||||||
|
return false;
|
||||||
|
else
|
||||||
|
s += 4;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
49
rpc/nanopb/pb_common.h
Normal file
49
rpc/nanopb/pb_common.h
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
/* pb_common.h: Common support functions for pb_encode.c and pb_decode.c.
|
||||||
|
* These functions are rarely needed by applications directly.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PB_COMMON_H_INCLUDED
|
||||||
|
#define PB_COMMON_H_INCLUDED
|
||||||
|
|
||||||
|
#include "pb.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Initialize the field iterator structure to beginning.
|
||||||
|
* Returns false if the message type is empty. */
|
||||||
|
bool pb_field_iter_begin(pb_field_iter_t *iter, const pb_msgdesc_t *desc, void *message);
|
||||||
|
|
||||||
|
/* Get a field iterator for extension field. */
|
||||||
|
bool pb_field_iter_begin_extension(pb_field_iter_t *iter, pb_extension_t *extension);
|
||||||
|
|
||||||
|
/* Same as pb_field_iter_begin(), but for const message pointer.
|
||||||
|
* Note that the pointers in pb_field_iter_t will be non-const but shouldn't
|
||||||
|
* be written to when using these functions. */
|
||||||
|
bool pb_field_iter_begin_const(pb_field_iter_t *iter, const pb_msgdesc_t *desc, const void *message);
|
||||||
|
bool pb_field_iter_begin_extension_const(pb_field_iter_t *iter, const pb_extension_t *extension);
|
||||||
|
|
||||||
|
/* Advance the iterator to the next field.
|
||||||
|
* Returns false when the iterator wraps back to the first field. */
|
||||||
|
bool pb_field_iter_next(pb_field_iter_t *iter);
|
||||||
|
|
||||||
|
/* Advance the iterator until it points at a field with the given tag.
|
||||||
|
* Returns false if no such field exists. */
|
||||||
|
bool pb_field_iter_find(pb_field_iter_t *iter, uint32_t tag);
|
||||||
|
|
||||||
|
/* Find a field with type PB_LTYPE_EXTENSION, or return false if not found.
|
||||||
|
* There can be only one extension range field per message. */
|
||||||
|
bool pb_field_iter_find_extension(pb_field_iter_t *iter);
|
||||||
|
|
||||||
|
#ifdef PB_VALIDATE_UTF8
|
||||||
|
/* Validate UTF-8 text string */
|
||||||
|
bool pb_validate_utf8(const char *s);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
1727
rpc/nanopb/pb_decode.c
Normal file
1727
rpc/nanopb/pb_decode.c
Normal file
File diff suppressed because it is too large
Load Diff
193
rpc/nanopb/pb_decode.h
Normal file
193
rpc/nanopb/pb_decode.h
Normal file
@ -0,0 +1,193 @@
|
|||||||
|
/* pb_decode.h: Functions to decode protocol buffers. Depends on pb_decode.c.
|
||||||
|
* The main function is pb_decode. You also need an input stream, and the
|
||||||
|
* field descriptions created by nanopb_generator.py.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PB_DECODE_H_INCLUDED
|
||||||
|
#define PB_DECODE_H_INCLUDED
|
||||||
|
|
||||||
|
#include "pb.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Structure for defining custom input streams. You will need to provide
|
||||||
|
* a callback function to read the bytes from your storage, which can be
|
||||||
|
* for example a file or a network socket.
|
||||||
|
*
|
||||||
|
* The callback must conform to these rules:
|
||||||
|
*
|
||||||
|
* 1) Return false on IO errors. This will cause decoding to abort.
|
||||||
|
* 2) You can use state to store your own data (e.g. buffer pointer),
|
||||||
|
* and rely on pb_read to verify that no-body reads past bytes_left.
|
||||||
|
* 3) Your callback may be used with substreams, in which case bytes_left
|
||||||
|
* is different than from the main stream. Don't use bytes_left to compute
|
||||||
|
* any pointers.
|
||||||
|
*/
|
||||||
|
struct pb_istream_s
|
||||||
|
{
|
||||||
|
#ifdef PB_BUFFER_ONLY
|
||||||
|
/* Callback pointer is not used in buffer-only configuration.
|
||||||
|
* Having an int pointer here allows binary compatibility but
|
||||||
|
* gives an error if someone tries to assign callback function.
|
||||||
|
*/
|
||||||
|
int *callback;
|
||||||
|
#else
|
||||||
|
bool (*callback)(pb_istream_t *stream, pb_byte_t *buf, size_t count);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void *state; /* Free field for use by callback implementation */
|
||||||
|
size_t bytes_left;
|
||||||
|
|
||||||
|
#ifndef PB_NO_ERRMSG
|
||||||
|
const char *errmsg;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifndef PB_NO_ERRMSG
|
||||||
|
#define PB_ISTREAM_EMPTY {0,0,0,0}
|
||||||
|
#else
|
||||||
|
#define PB_ISTREAM_EMPTY {0,0,0}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/***************************
|
||||||
|
* Main decoding functions *
|
||||||
|
***************************/
|
||||||
|
|
||||||
|
/* Decode a single protocol buffers message from input stream into a C structure.
|
||||||
|
* Returns true on success, false on any failure.
|
||||||
|
* The actual struct pointed to by dest must match the description in fields.
|
||||||
|
* Callback fields of the destination structure must be initialized by caller.
|
||||||
|
* All other fields will be initialized by this function.
|
||||||
|
*
|
||||||
|
* Example usage:
|
||||||
|
* MyMessage msg = {};
|
||||||
|
* uint8_t buffer[64];
|
||||||
|
* pb_istream_t stream;
|
||||||
|
*
|
||||||
|
* // ... read some data into buffer ...
|
||||||
|
*
|
||||||
|
* stream = pb_istream_from_buffer(buffer, count);
|
||||||
|
* pb_decode(&stream, MyMessage_fields, &msg);
|
||||||
|
*/
|
||||||
|
bool pb_decode(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct);
|
||||||
|
|
||||||
|
/* Extended version of pb_decode, with several options to control
|
||||||
|
* the decoding process:
|
||||||
|
*
|
||||||
|
* PB_DECODE_NOINIT: Do not initialize the fields to default values.
|
||||||
|
* This is slightly faster if you do not need the default
|
||||||
|
* values and instead initialize the structure to 0 using
|
||||||
|
* e.g. memset(). This can also be used for merging two
|
||||||
|
* messages, i.e. combine already existing data with new
|
||||||
|
* values.
|
||||||
|
*
|
||||||
|
* PB_DECODE_DELIMITED: Input message starts with the message size as varint.
|
||||||
|
* Corresponds to parseDelimitedFrom() in Google's
|
||||||
|
* protobuf API.
|
||||||
|
*
|
||||||
|
* PB_DECODE_NULLTERMINATED: Stop reading when field tag is read as 0. This allows
|
||||||
|
* reading null terminated messages.
|
||||||
|
* NOTE: Until nanopb-0.4.0, pb_decode() also allows
|
||||||
|
* null-termination. This behaviour is not supported in
|
||||||
|
* most other protobuf implementations, so PB_DECODE_DELIMITED
|
||||||
|
* is a better option for compatibility.
|
||||||
|
*
|
||||||
|
* Multiple flags can be combined with bitwise or (| operator)
|
||||||
|
*/
|
||||||
|
#define PB_DECODE_NOINIT 0x01U
|
||||||
|
#define PB_DECODE_DELIMITED 0x02U
|
||||||
|
#define PB_DECODE_NULLTERMINATED 0x04U
|
||||||
|
bool pb_decode_ex(pb_istream_t *stream, const pb_msgdesc_t *fields, void *dest_struct, unsigned int flags);
|
||||||
|
|
||||||
|
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
|
||||||
|
#define pb_decode_noinit(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_NOINIT)
|
||||||
|
#define pb_decode_delimited(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_DELIMITED)
|
||||||
|
#define pb_decode_delimited_noinit(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_DELIMITED | PB_DECODE_NOINIT)
|
||||||
|
#define pb_decode_nullterminated(s,f,d) pb_decode_ex(s,f,d, PB_DECODE_NULLTERMINATED)
|
||||||
|
|
||||||
|
/* Release any allocated pointer fields. If you use dynamic allocation, you should
|
||||||
|
* call this for any successfully decoded message when you are done with it. If
|
||||||
|
* pb_decode() returns with an error, the message is already released.
|
||||||
|
*/
|
||||||
|
void pb_release(const pb_msgdesc_t *fields, void *dest_struct);
|
||||||
|
|
||||||
|
/**************************************
|
||||||
|
* Functions for manipulating streams *
|
||||||
|
**************************************/
|
||||||
|
|
||||||
|
/* Create an input stream for reading from a memory buffer.
|
||||||
|
*
|
||||||
|
* msglen should be the actual length of the message, not the full size of
|
||||||
|
* allocated buffer.
|
||||||
|
*
|
||||||
|
* Alternatively, you can use a custom stream that reads directly from e.g.
|
||||||
|
* a file or a network socket.
|
||||||
|
*/
|
||||||
|
pb_istream_t pb_istream_from_buffer(const pb_byte_t *buf, size_t msglen);
|
||||||
|
|
||||||
|
/* Function to read from a pb_istream_t. You can use this if you need to
|
||||||
|
* read some custom header data, or to read data in field callbacks.
|
||||||
|
*/
|
||||||
|
bool pb_read(pb_istream_t *stream, pb_byte_t *buf, size_t count);
|
||||||
|
|
||||||
|
|
||||||
|
/************************************************
|
||||||
|
* Helper functions for writing field callbacks *
|
||||||
|
************************************************/
|
||||||
|
|
||||||
|
/* Decode the tag for the next field in the stream. Gives the wire type and
|
||||||
|
* field tag. At end of the message, returns false and sets eof to true. */
|
||||||
|
bool pb_decode_tag(pb_istream_t *stream, pb_wire_type_t *wire_type, uint32_t *tag, bool *eof);
|
||||||
|
|
||||||
|
/* Skip the field payload data, given the wire type. */
|
||||||
|
bool pb_skip_field(pb_istream_t *stream, pb_wire_type_t wire_type);
|
||||||
|
|
||||||
|
/* Decode an integer in the varint format. This works for enum, int32,
|
||||||
|
* int64, uint32 and uint64 field types. */
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
bool pb_decode_varint(pb_istream_t *stream, uint64_t *dest);
|
||||||
|
#else
|
||||||
|
#define pb_decode_varint pb_decode_varint32
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Decode an integer in the varint format. This works for enum, int32,
|
||||||
|
* and uint32 field types. */
|
||||||
|
bool pb_decode_varint32(pb_istream_t *stream, uint32_t *dest);
|
||||||
|
|
||||||
|
/* Decode a bool value in varint format. */
|
||||||
|
bool pb_decode_bool(pb_istream_t *stream, bool *dest);
|
||||||
|
|
||||||
|
/* Decode an integer in the zig-zagged svarint format. This works for sint32
|
||||||
|
* and sint64. */
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
bool pb_decode_svarint(pb_istream_t *stream, int64_t *dest);
|
||||||
|
#else
|
||||||
|
bool pb_decode_svarint(pb_istream_t *stream, int32_t *dest);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Decode a fixed32, sfixed32 or float value. You need to pass a pointer to
|
||||||
|
* a 4-byte wide C variable. */
|
||||||
|
bool pb_decode_fixed32(pb_istream_t *stream, void *dest);
|
||||||
|
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
/* Decode a fixed64, sfixed64 or double value. You need to pass a pointer to
|
||||||
|
* a 8-byte wide C variable. */
|
||||||
|
bool pb_decode_fixed64(pb_istream_t *stream, void *dest);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PB_CONVERT_DOUBLE_FLOAT
|
||||||
|
/* Decode a double value into float variable. */
|
||||||
|
bool pb_decode_double_as_float(pb_istream_t *stream, float *dest);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Make a limited-length substream for reading a PB_WT_STRING field. */
|
||||||
|
bool pb_make_string_substream(pb_istream_t *stream, pb_istream_t *substream);
|
||||||
|
bool pb_close_string_substream(pb_istream_t *stream, pb_istream_t *substream);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
1000
rpc/nanopb/pb_encode.c
Normal file
1000
rpc/nanopb/pb_encode.c
Normal file
File diff suppressed because it is too large
Load Diff
185
rpc/nanopb/pb_encode.h
Normal file
185
rpc/nanopb/pb_encode.h
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
/* pb_encode.h: Functions to encode protocol buffers. Depends on pb_encode.c.
|
||||||
|
* The main function is pb_encode. You also need an output stream, and the
|
||||||
|
* field descriptions created by nanopb_generator.py.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef PB_ENCODE_H_INCLUDED
|
||||||
|
#define PB_ENCODE_H_INCLUDED
|
||||||
|
|
||||||
|
#include "pb.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Structure for defining custom output streams. You will need to provide
|
||||||
|
* a callback function to write the bytes to your storage, which can be
|
||||||
|
* for example a file or a network socket.
|
||||||
|
*
|
||||||
|
* The callback must conform to these rules:
|
||||||
|
*
|
||||||
|
* 1) Return false on IO errors. This will cause encoding to abort.
|
||||||
|
* 2) You can use state to store your own data (e.g. buffer pointer).
|
||||||
|
* 3) pb_write will update bytes_written after your callback runs.
|
||||||
|
* 4) Substreams will modify max_size and bytes_written. Don't use them
|
||||||
|
* to calculate any pointers.
|
||||||
|
*/
|
||||||
|
struct pb_ostream_s
|
||||||
|
{
|
||||||
|
#ifdef PB_BUFFER_ONLY
|
||||||
|
/* Callback pointer is not used in buffer-only configuration.
|
||||||
|
* Having an int pointer here allows binary compatibility but
|
||||||
|
* gives an error if someone tries to assign callback function.
|
||||||
|
* Also, NULL pointer marks a 'sizing stream' that does not
|
||||||
|
* write anything.
|
||||||
|
*/
|
||||||
|
const int *callback;
|
||||||
|
#else
|
||||||
|
bool (*callback)(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
|
||||||
|
#endif
|
||||||
|
void *state; /* Free field for use by callback implementation. */
|
||||||
|
size_t max_size; /* Limit number of output bytes written (or use SIZE_MAX). */
|
||||||
|
size_t bytes_written; /* Number of bytes written so far. */
|
||||||
|
|
||||||
|
#ifndef PB_NO_ERRMSG
|
||||||
|
const char *errmsg;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
/***************************
|
||||||
|
* Main encoding functions *
|
||||||
|
***************************/
|
||||||
|
|
||||||
|
/* Encode a single protocol buffers message from C structure into a stream.
|
||||||
|
* Returns true on success, false on any failure.
|
||||||
|
* The actual struct pointed to by src_struct must match the description in fields.
|
||||||
|
* All required fields in the struct are assumed to have been filled in.
|
||||||
|
*
|
||||||
|
* Example usage:
|
||||||
|
* MyMessage msg = {};
|
||||||
|
* uint8_t buffer[64];
|
||||||
|
* pb_ostream_t stream;
|
||||||
|
*
|
||||||
|
* msg.field1 = 42;
|
||||||
|
* stream = pb_ostream_from_buffer(buffer, sizeof(buffer));
|
||||||
|
* pb_encode(&stream, MyMessage_fields, &msg);
|
||||||
|
*/
|
||||||
|
bool pb_encode(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct);
|
||||||
|
|
||||||
|
/* Extended version of pb_encode, with several options to control the
|
||||||
|
* encoding process:
|
||||||
|
*
|
||||||
|
* PB_ENCODE_DELIMITED: Prepend the length of message as a varint.
|
||||||
|
* Corresponds to writeDelimitedTo() in Google's
|
||||||
|
* protobuf API.
|
||||||
|
*
|
||||||
|
* PB_ENCODE_NULLTERMINATED: Append a null byte to the message for termination.
|
||||||
|
* NOTE: This behaviour is not supported in most other
|
||||||
|
* protobuf implementations, so PB_ENCODE_DELIMITED
|
||||||
|
* is a better option for compatibility.
|
||||||
|
*/
|
||||||
|
#define PB_ENCODE_DELIMITED 0x02U
|
||||||
|
#define PB_ENCODE_NULLTERMINATED 0x04U
|
||||||
|
bool pb_encode_ex(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct, unsigned int flags);
|
||||||
|
|
||||||
|
/* Defines for backwards compatibility with code written before nanopb-0.4.0 */
|
||||||
|
#define pb_encode_delimited(s,f,d) pb_encode_ex(s,f,d, PB_ENCODE_DELIMITED)
|
||||||
|
#define pb_encode_nullterminated(s,f,d) pb_encode_ex(s,f,d, PB_ENCODE_NULLTERMINATED)
|
||||||
|
|
||||||
|
/* Encode the message to get the size of the encoded data, but do not store
|
||||||
|
* the data. */
|
||||||
|
bool pb_get_encoded_size(size_t *size, const pb_msgdesc_t *fields, const void *src_struct);
|
||||||
|
|
||||||
|
/**************************************
|
||||||
|
* Functions for manipulating streams *
|
||||||
|
**************************************/
|
||||||
|
|
||||||
|
/* Create an output stream for writing into a memory buffer.
|
||||||
|
* The number of bytes written can be found in stream.bytes_written after
|
||||||
|
* encoding the message.
|
||||||
|
*
|
||||||
|
* Alternatively, you can use a custom stream that writes directly to e.g.
|
||||||
|
* a file or a network socket.
|
||||||
|
*/
|
||||||
|
pb_ostream_t pb_ostream_from_buffer(pb_byte_t *buf, size_t bufsize);
|
||||||
|
|
||||||
|
/* Pseudo-stream for measuring the size of a message without actually storing
|
||||||
|
* the encoded data.
|
||||||
|
*
|
||||||
|
* Example usage:
|
||||||
|
* MyMessage msg = {};
|
||||||
|
* pb_ostream_t stream = PB_OSTREAM_SIZING;
|
||||||
|
* pb_encode(&stream, MyMessage_fields, &msg);
|
||||||
|
* printf("Message size is %d\n", stream.bytes_written);
|
||||||
|
*/
|
||||||
|
#ifndef PB_NO_ERRMSG
|
||||||
|
#define PB_OSTREAM_SIZING {0,0,0,0,0}
|
||||||
|
#else
|
||||||
|
#define PB_OSTREAM_SIZING {0,0,0,0}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Function to write into a pb_ostream_t stream. You can use this if you need
|
||||||
|
* to append or prepend some custom headers to the message.
|
||||||
|
*/
|
||||||
|
bool pb_write(pb_ostream_t *stream, const pb_byte_t *buf, size_t count);
|
||||||
|
|
||||||
|
|
||||||
|
/************************************************
|
||||||
|
* Helper functions for writing field callbacks *
|
||||||
|
************************************************/
|
||||||
|
|
||||||
|
/* Encode field header based on type and field number defined in the field
|
||||||
|
* structure. Call this from the callback before writing out field contents. */
|
||||||
|
bool pb_encode_tag_for_field(pb_ostream_t *stream, const pb_field_iter_t *field);
|
||||||
|
|
||||||
|
/* Encode field header by manually specifying wire type. You need to use this
|
||||||
|
* if you want to write out packed arrays from a callback field. */
|
||||||
|
bool pb_encode_tag(pb_ostream_t *stream, pb_wire_type_t wiretype, uint32_t field_number);
|
||||||
|
|
||||||
|
/* Encode an integer in the varint format.
|
||||||
|
* This works for bool, enum, int32, int64, uint32 and uint64 field types. */
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
bool pb_encode_varint(pb_ostream_t *stream, uint64_t value);
|
||||||
|
#else
|
||||||
|
bool pb_encode_varint(pb_ostream_t *stream, uint32_t value);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Encode an integer in the zig-zagged svarint format.
|
||||||
|
* This works for sint32 and sint64. */
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
bool pb_encode_svarint(pb_ostream_t *stream, int64_t value);
|
||||||
|
#else
|
||||||
|
bool pb_encode_svarint(pb_ostream_t *stream, int32_t value);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Encode a string or bytes type field. For strings, pass strlen(s) as size. */
|
||||||
|
bool pb_encode_string(pb_ostream_t *stream, const pb_byte_t *buffer, size_t size);
|
||||||
|
|
||||||
|
/* Encode a fixed32, sfixed32 or float value.
|
||||||
|
* You need to pass a pointer to a 4-byte wide C variable. */
|
||||||
|
bool pb_encode_fixed32(pb_ostream_t *stream, const void *value);
|
||||||
|
|
||||||
|
#ifndef PB_WITHOUT_64BIT
|
||||||
|
/* Encode a fixed64, sfixed64 or double value.
|
||||||
|
* You need to pass a pointer to a 8-byte wide C variable. */
|
||||||
|
bool pb_encode_fixed64(pb_ostream_t *stream, const void *value);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef PB_CONVERT_DOUBLE_FLOAT
|
||||||
|
/* Encode a float value so that it appears like a double in the encoded
|
||||||
|
* message. */
|
||||||
|
bool pb_encode_float_as_double(pb_ostream_t *stream, float value);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/* Encode a submessage field.
|
||||||
|
* You need to pass the pb_field_t array and pointer to struct, just like
|
||||||
|
* with pb_encode(). This internally encodes the submessage twice, first to
|
||||||
|
* calculate message size and then to actually write it out.
|
||||||
|
*/
|
||||||
|
bool pb_encode_submessage(pb_ostream_t *stream, const pb_msgdesc_t *fields, const void *src_struct);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} /* extern "C" */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
6
rpc/proto/wcf.options
Normal file
6
rpc/proto/wcf.options
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
# Generate all fields as pointers.
|
||||||
|
* mangle_names:M_STRIP_PACKAGE
|
||||||
|
* fallback_type:FT_POINTER
|
||||||
|
MsgTypes.types max_count:10
|
||||||
|
MsgTypes.TypesEntry.value max_size:16
|
||||||
|
# MsgTypes.* max_size:16
|
||||||
138
rpc/proto/wcf.proto
Normal file
138
rpc/proto/wcf.proto
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
syntax = "proto3";
|
||||||
|
|
||||||
|
package wcf;
|
||||||
|
option java_package = "com.iamteer.wcf";
|
||||||
|
|
||||||
|
/*
|
||||||
|
service Wcf {
|
||||||
|
rpc RpcIsLogin(Empty) returns (Response) {}
|
||||||
|
rpc RpcGetSelfWxid(Empty) returns (String) {}
|
||||||
|
rpc RpcEnableRecvMsg(Empty) returns (stream WxMsg) {}
|
||||||
|
rpc RpcDisableRecvMsg(Empty) returns (Response) {}
|
||||||
|
rpc RpcSendTextMsg(TextMsg) returns (Response) {}
|
||||||
|
rpc RpcSendImageMsg(ImageMsg) returns (Response) {}
|
||||||
|
rpc RpcGetMsgTypes(Empty) returns (MsgTypes) {}
|
||||||
|
rpc RpcGetContacts(Empty) returns (Contacts) {}
|
||||||
|
rpc RpcGetDbNames(Empty) returns (DbNames) {}
|
||||||
|
rpc RpcGetDbTables(String) returns (DbTables) {}
|
||||||
|
rpc RpcExecDbQuery(DbQuery) returns (DbRows) {}
|
||||||
|
rpc RpcAcceptNewFriend(Verification) returns (Response) {}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
enum Functions {
|
||||||
|
FUNC_RESERVED = 0x00;
|
||||||
|
FUNC_IS_LOGIN = 0x01;
|
||||||
|
FUNC_GET_SELF_WXID = 0x10;
|
||||||
|
FUNC_GET_MSG_TYPES = 0x11;
|
||||||
|
FUNC_GET_CONTACTS = 0x12;
|
||||||
|
FUNC_GET_DB_NAMES = 0x13;
|
||||||
|
FUNC_GET_DB_TABLES = 0x14;
|
||||||
|
FUNC_SEND_TXT = 0x20;
|
||||||
|
FUNC_SEND_IMG = 0x21;
|
||||||
|
FUNC_ENABLE_RECV_TXT = 0x30;
|
||||||
|
FUNC_DISABLE_RECV_TXT = 0x40;
|
||||||
|
FUNC_EXEC_DB_QUERY = 0x50;
|
||||||
|
FUNC_ACCEPT_FRIEND = 0x51;
|
||||||
|
}
|
||||||
|
|
||||||
|
message Request
|
||||||
|
{
|
||||||
|
Functions func = 1;
|
||||||
|
oneof msg
|
||||||
|
{
|
||||||
|
Empty empty = 2;
|
||||||
|
string str = 3;
|
||||||
|
TextMsg txt = 4;
|
||||||
|
ImageMsg img = 5;
|
||||||
|
DbQuery query = 6;
|
||||||
|
Verification v = 7;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
message Response
|
||||||
|
{
|
||||||
|
Functions func = 1;
|
||||||
|
oneof msg
|
||||||
|
{
|
||||||
|
int32 status = 2;
|
||||||
|
string str = 3;
|
||||||
|
WxMsg wxmsg = 4;
|
||||||
|
MsgTypes types = 5;
|
||||||
|
RpcContacts contacts = 6;
|
||||||
|
DbNames dbs = 7;
|
||||||
|
DbTables tables = 8;
|
||||||
|
DbRows rows = 9;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
message Empty { }
|
||||||
|
|
||||||
|
message WxMsg
|
||||||
|
{
|
||||||
|
bool is_self = 1; // 是否自己发送的
|
||||||
|
bool is_group = 2; // 是否群消息
|
||||||
|
int32 type = 3; // 消息类型
|
||||||
|
string id = 4; // 消息 id
|
||||||
|
string xml = 5; // 消息 xml
|
||||||
|
string sender = 6; // 消息发送者
|
||||||
|
string roomid = 7; // 群 id（如果是群消息的话）
|
||||||
|
string content = 8; // 消息内容
|
||||||
|
}
|
||||||
|
|
||||||
|
message TextMsg
|
||||||
|
{
|
||||||
|
string msg = 1; // 要发送的消息内容
|
||||||
|
string receiver = 2; // 消息接收人，当为群时可@
|
||||||
|
string aters = 3; // 要@的人列表，逗号分隔
|
||||||
|
}
|
||||||
|
|
||||||
|
message ImageMsg
|
||||||
|
{
|
||||||
|
string path = 1; // 要发送的图片的路径
|
||||||
|
string receiver = 2; // 消息接收人
|
||||||
|
}
|
||||||
|
|
||||||
|
message MsgTypes { map<int32, string> types = 1; }
|
||||||
|
|
||||||
|
message RpcContact
|
||||||
|
{
|
||||||
|
string wxid = 1; // 微信 id
|
||||||
|
string code = 2; // 微信号
|
||||||
|
string name = 3; // 微信昵称
|
||||||
|
string country = 4; // 国家
|
||||||
|
string province = 5; // 省/州
|
||||||
|
string city = 6; // 城市
|
||||||
|
int32 gender = 7; // 性别
|
||||||
|
}
|
||||||
|
message RpcContacts { repeated RpcContact contacts = 1; }
|
||||||
|
|
||||||
|
message DbNames { repeated string names = 1; }
|
||||||
|
|
||||||
|
message DbTable
|
||||||
|
{
|
||||||
|
string name = 1; // 表名
|
||||||
|
string sql = 2; // 建表 SQL
|
||||||
|
}
|
||||||
|
message DbTables { repeated DbTable tables = 1; }
|
||||||
|
|
||||||
|
message DbQuery
|
||||||
|
{
|
||||||
|
string db = 1; // 目标数据库
|
||||||
|
string sql = 2; // 查询 SQL
|
||||||
|
}
|
||||||
|
|
||||||
|
message DbField
|
||||||
|
{
|
||||||
|
int32 type = 1; // 字段类型
|
||||||
|
string column = 2; // 字段名称
|
||||||
|
bytes content = 3; // 字段内容
|
||||||
|
}
|
||||||
|
message DbRow { repeated DbField fields = 1; }
|
||||||
|
message DbRows { repeated DbRow rows = 1; }
|
||||||
|
|
||||||
|
message Verification
|
||||||
|
{
|
||||||
|
string v3 = 1;
|
||||||
|
string v4 = 2;
|
||||||
|
}
|
||||||
@ -44,7 +44,7 @@ int WxInitSDK()
|
|||||||
LOG_ERROR("Failed to InitSpy.");
|
LOG_ERROR("Failed to InitSpy.");
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
#if 0
|
||||||
do {
|
do {
|
||||||
if (!CallDllFunc(wcProcess, spyDllPath, spyBase, "IsLogin", (DWORD *)&status)) {
|
if (!CallDllFunc(wcProcess, spyDllPath, spyBase, "IsLogin", (DWORD *)&status)) {
|
||||||
LOG_ERROR("Failed to check login status.");
|
LOG_ERROR("Failed to check login status.");
|
||||||
@ -52,7 +52,7 @@ int WxInitSDK()
|
|||||||
}
|
}
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
} while (status == 0);
|
} while (status == 0);
|
||||||
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -115,9 +115,9 @@
|
|||||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
<PrecompiledHeaderFile>
|
<PrecompiledHeaderFile>
|
||||||
</PrecompiledHeaderFile>
|
</PrecompiledHeaderFile>
|
||||||
<AdditionalIncludeDirectories>$(SolutionDir)rpc;C:\Tools\vcpkg\installed\x86-windows-static\include</AdditionalIncludeDirectories>
|
<AdditionalIncludeDirectories>$(SolutionDir)rpc\nanopb;$(SolutionDir)rpc\proto;C:\Tools\vcpkg\installed\x86-windows-static\include</AdditionalIncludeDirectories>
|
||||||
<PrecompiledHeaderOutputFile />
|
<PrecompiledHeaderOutputFile />
|
||||||
<DisableSpecificWarnings>4251</DisableSpecificWarnings>
|
<DisableSpecificWarnings>4251;4819</DisableSpecificWarnings>
|
||||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
@ -145,12 +145,12 @@ xcopy /y $(OutDir)spy.dll $(SolutionDir)python\wcferry</Command>
|
|||||||
<Message>Copy spy.dll</Message>
|
<Message>Copy spy.dll</Message>
|
||||||
</PostBuildEvent>
|
</PostBuildEvent>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Command>cd $(SolutionDir)proto
|
<Command>cd $(SolutionDir)rpc\proto
|
||||||
protoc -I=. --cpp_out=. wcf.proto
|
C:\Tools\nanopb\protoc --nanopb_out=. wcf.proto
|
||||||
protoc -I=. --grpc_out=. --plugin=protoc-gen-grpc="C:\Tools\vcpkg\packages\grpc_x64-windows\tools\grpc\grpc_cpp_plugin.exe" wcf.proto</Command>
|
</Command>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
<PreBuildEvent>
|
<PreBuildEvent>
|
||||||
<Message>gRPC</Message>
|
<Message>Generating PB files</Message>
|
||||||
</PreBuildEvent>
|
</PreBuildEvent>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
@ -190,8 +190,11 @@ protoc -I=. --grpc_out=. --plugin=protoc-gen-grpc="C:\Tools\vcpkg\packages\grpc_
|
|||||||
</Link>
|
</Link>
|
||||||
</ItemDefinitionGroup>
|
</ItemDefinitionGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClInclude Include="..\proto\wcf.grpc.pb.h" />
|
<ClInclude Include="..\rpc\nanopb\pb.h" />
|
||||||
<ClInclude Include="..\proto\wcf.pb.h" />
|
<ClInclude Include="..\rpc\nanopb\pb_common.h" />
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_decode.h" />
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_encode.h" />
|
||||||
|
<ClInclude Include="..\rpc\proto\wcf.pb.h" />
|
||||||
<ClInclude Include="accept_new_friend.h" />
|
<ClInclude Include="accept_new_friend.h" />
|
||||||
<ClInclude Include="exec_sql.h" />
|
<ClInclude Include="exec_sql.h" />
|
||||||
<ClInclude Include="framework.h" />
|
<ClInclude Include="framework.h" />
|
||||||
@ -206,8 +209,10 @@ protoc -I=. --grpc_out=. --plugin=protoc-gen-grpc="C:\Tools\vcpkg\packages\grpc_
|
|||||||
<ClInclude Include="util.h" />
|
<ClInclude Include="util.h" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ClCompile Include="..\proto\wcf.grpc.pb.cc" />
|
<ClCompile Include="..\rpc\nanopb\pb_common.c" />
|
||||||
<ClCompile Include="..\proto\wcf.pb.cc" />
|
<ClCompile Include="..\rpc\nanopb\pb_decode.c" />
|
||||||
|
<ClCompile Include="..\rpc\nanopb\pb_encode.c" />
|
||||||
|
<ClCompile Include="..\rpc\proto\wcf.pb.c" />
|
||||||
<ClCompile Include="accept_new_friend.cpp" />
|
<ClCompile Include="accept_new_friend.cpp" />
|
||||||
<ClCompile Include="dllmain.cpp" />
|
<ClCompile Include="dllmain.cpp" />
|
||||||
<ClCompile Include="exec_sql.cpp" />
|
<ClCompile Include="exec_sql.cpp" />
|
||||||
@ -221,7 +226,7 @@ protoc -I=. --grpc_out=. --plugin=protoc-gen-grpc="C:\Tools\vcpkg\packages\grpc_
|
|||||||
<ClCompile Include="util.cpp" />
|
<ClCompile Include="util.cpp" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="..\proto\wcf.proto" />
|
<None Include="..\rpc\proto\wcf.proto" />
|
||||||
<None Include="spy.def" />
|
<None Include="spy.def" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
|||||||
@ -13,8 +13,8 @@
|
|||||||
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
</Filter>
|
</Filter>
|
||||||
<Filter Include="proto">
|
<Filter Include="nnrpc">
|
||||||
<UniqueIdentifier>{5da8b2ee-3201-441c-b42f-a420e9aad78b}</UniqueIdentifier>
|
<UniqueIdentifier>{7e39c2cc-c605-4204-88dc-9ae15c7d8d6c}</UniqueIdentifier>
|
||||||
</Filter>
|
</Filter>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -54,11 +54,20 @@
|
|||||||
<ClInclude Include="util.h">
|
<ClInclude Include="util.h">
|
||||||
<Filter>头文件</Filter>
|
<Filter>头文件</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\proto\wcf.grpc.pb.h">
|
<ClInclude Include="..\rpc\nanopb\pb.h">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
<ClInclude Include="..\proto\wcf.pb.h">
|
<ClInclude Include="..\rpc\nanopb\pb_common.h">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_decode.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\nanopb\pb_encode.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="..\rpc\proto\wcf.pb.h">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
</ClInclude>
|
</ClInclude>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@ -95,19 +104,25 @@
|
|||||||
<ClCompile Include="util.cpp">
|
<ClCompile Include="util.cpp">
|
||||||
<Filter>源文件</Filter>
|
<Filter>源文件</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\proto\wcf.grpc.pb.cc">
|
<ClCompile Include="..\rpc\nanopb\pb_common.c">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
<ClCompile Include="..\proto\wcf.pb.cc">
|
<ClCompile Include="..\rpc\nanopb\pb_decode.c">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\rpc\nanopb\pb_encode.c">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="..\rpc\proto\wcf.pb.c">
|
||||||
|
<Filter>nnrpc</Filter>
|
||||||
</ClCompile>
|
</ClCompile>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="spy.def">
|
<None Include="spy.def">
|
||||||
<Filter>源文件</Filter>
|
<Filter>源文件</Filter>
|
||||||
</None>
|
</None>
|
||||||
<None Include="..\proto\wcf.proto">
|
<None Include="..\rpc\proto\wcf.proto">
|
||||||
<Filter>proto</Filter>
|
<Filter>nnrpc</Filter>
|
||||||
</None>
|
</None>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@ -1,7 +1,7 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#if 0
|
||||||
#include "exec_sql.h"
|
#include "exec_sql.h"
|
||||||
#include "load_calls.h"
|
#include "load_calls.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
@ -174,3 +174,4 @@ void ExecDbQuery(const string db, const string sql, wcf::DbRows *rows)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@ -1,5 +1,5 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#if 0
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
@ -8,3 +8,4 @@
|
|||||||
void GetDbNames(wcf::DbNames *names);
|
void GetDbNames(wcf::DbNames *names);
|
||||||
void GetDbTables(const std::string db, wcf::DbTables *tables);
|
void GetDbTables(const std::string db, wcf::DbTables *tables);
|
||||||
void ExecDbQuery(const std::string db, const std::string sql, wcf::DbRows *rows);
|
void ExecDbQuery(const std::string db, const std::string sql, wcf::DbRows *rows);
|
||||||
|
#endif
|
||||||
@ -1,5 +1,5 @@
|
|||||||
#pragma execution_character_set("utf-8")
|
#pragma execution_character_set("utf-8")
|
||||||
|
#if 0
|
||||||
#include "get_contacts.h"
|
#include "get_contacts.h"
|
||||||
#include "load_calls.h"
|
#include "load_calls.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
@ -29,3 +29,4 @@ bool GetContacts(wcf::Contacts *contacts)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@ -1,5 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#if 0
|
||||||
#include "../proto/wcf.grpc.pb.h"
|
#include "../proto/wcf.grpc.pb.h"
|
||||||
|
|
||||||
bool GetContacts(wcf::Contacts *contacts);
|
bool GetContacts(wcf::Contacts *contacts);
|
||||||
|
#endif
|
||||||
@ -1,5 +1,5 @@
|
|||||||
#pragma execution_character_set("utf-8")
|
#pragma execution_character_set("utf-8")
|
||||||
|
#if 0
|
||||||
#include <queue>
|
#include <queue>
|
||||||
|
|
||||||
#include "framework.h"
|
#include "framework.h"
|
||||||
@ -141,3 +141,4 @@ void UnListenMessage()
|
|||||||
UnHookAddress(recvMsgHookAddr, recvMsgBackupCode);
|
UnHookAddress(recvMsgHookAddr, recvMsgBackupCode);
|
||||||
gIsListening = false;
|
gIsListening = false;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
@ -1,7 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
#if 0
|
||||||
#include "../proto/wcf.grpc.pb.h"
|
#include "../proto/wcf.grpc.pb.h"
|
||||||
|
|
||||||
void ListenMessage();
|
void ListenMessage();
|
||||||
void UnListenMessage();
|
void UnListenMessage();
|
||||||
void GetMsgTypes(wcf::MsgTypes *types);
|
void GetMsgTypes(wcf::MsgTypes *types);
|
||||||
|
#endif
|
||||||
@ -7,13 +7,13 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
#include <grpc/grpc.h>
|
#include <nng/nng.h>
|
||||||
#include <grpcpp/security/server_credentials.h>
|
#include <nng/protocol/pair1/pair.h>
|
||||||
#include <grpcpp/server.h>
|
#include <nng/supplemental/util/platform.h>
|
||||||
#include <grpcpp/server_builder.h>
|
#include <pb_decode.h>
|
||||||
#include <grpcpp/server_context.h>
|
#include <pb_encode.h>
|
||||||
|
|
||||||
#include "../proto/wcf.grpc.pb.h"
|
#include "wcf.pb.h"
|
||||||
|
|
||||||
#include "accept_new_friend.h"
|
#include "accept_new_friend.h"
|
||||||
#include "exec_sql.h"
|
#include "exec_sql.h"
|
||||||
@ -31,240 +31,150 @@ extern std::string GetSelfWxid(); // Defined in spy.cpp
|
|||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
using grpc::CallbackServerContext;
|
|
||||||
using grpc::Server;
|
|
||||||
using grpc::ServerBuilder;
|
|
||||||
using grpc::ServerUnaryReactor;
|
|
||||||
using grpc::ServerWriteReactor;
|
|
||||||
using grpc::Status;
|
|
||||||
|
|
||||||
using wcf::Contacts;
|
|
||||||
using wcf::DbField;
|
|
||||||
using wcf::DbNames;
|
|
||||||
using wcf::DbQuery;
|
|
||||||
using wcf::DbRow;
|
|
||||||
using wcf::DbRows;
|
|
||||||
using wcf::DbTable;
|
|
||||||
using wcf::DbTables;
|
|
||||||
using wcf::Empty;
|
|
||||||
using wcf::ImageMsg;
|
|
||||||
using wcf::MsgTypes;
|
|
||||||
using wcf::Response;
|
|
||||||
using wcf::String;
|
|
||||||
using wcf::TextMsg;
|
|
||||||
using wcf::Verification;
|
|
||||||
using wcf::Wcf;
|
|
||||||
using wcf::WxMsg;
|
|
||||||
|
|
||||||
mutex gMutex;
|
mutex gMutex;
|
||||||
queue<WxMsg> gMsgQueue;
|
queue<WxMsg> gMsgQueue;
|
||||||
condition_variable gCv;
|
condition_variable gCv;
|
||||||
bool gIsListening;
|
bool gIsListening;
|
||||||
|
|
||||||
class WcfImpl final : public Wcf::CallbackService
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
explicit WcfImpl() { }
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcIsLogin(CallbackServerContext *context, const Empty *empty, Response *rsp) override
|
|
||||||
{
|
|
||||||
int ret = IsLogin();
|
|
||||||
rsp->set_status(ret);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcGetSelfWxid(CallbackServerContext *context, const Empty *empty, String *rsp) override
|
|
||||||
{
|
|
||||||
string wxid = GetSelfWxid();
|
|
||||||
rsp->set_str(wxid);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerWriteReactor<WxMsg> *RpcEnableRecvMsg(CallbackServerContext *context, const Empty *empty) override
|
|
||||||
{
|
|
||||||
class Getter : public ServerWriteReactor<WxMsg>
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Getter()
|
|
||||||
{
|
|
||||||
LOG_INFO("Enable message listening.")
|
|
||||||
ListenMessage(); // gIsListening = true;
|
|
||||||
NextWrite();
|
|
||||||
}
|
|
||||||
void OnDone() override { delete this; }
|
|
||||||
void OnWriteDone(bool /*ok*/) override { NextWrite(); }
|
|
||||||
|
|
||||||
private:
|
|
||||||
void NextWrite()
|
|
||||||
{
|
|
||||||
unique_lock<std::mutex> lock(gMutex);
|
|
||||||
gCv.wait(lock, [&] { return !gMsgQueue.empty(); });
|
|
||||||
tmp_ = gMsgQueue.front();
|
|
||||||
gMsgQueue.pop();
|
|
||||||
lock.unlock();
|
|
||||||
if (gIsListening) {
|
|
||||||
StartWrite(&tmp_);
|
|
||||||
} else {
|
|
||||||
LOG_INFO("Disable message listening.")
|
|
||||||
Finish(Status::OK); // 结束本次通信
|
|
||||||
}
|
|
||||||
}
|
|
||||||
WxMsg tmp_; // 如果将它放到 NextWrite 内部，StartWrite 调用时可能已经出了作用域
|
|
||||||
};
|
|
||||||
|
|
||||||
return new Getter();
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcDisableRecvMsg(CallbackServerContext *context, const Empty *empty, Response *rsp) override
|
|
||||||
{
|
|
||||||
if (gIsListening) {
|
|
||||||
UnListenMessage(); // gIsListening = false;
|
|
||||||
// 发送消息，触发 NextWrite 的 Finish
|
|
||||||
WxMsg wxMsg;
|
|
||||||
unique_lock<std::mutex> lock(gMutex);
|
|
||||||
gMsgQueue.push(wxMsg);
|
|
||||||
lock.unlock();
|
|
||||||
gCv.notify_all();
|
|
||||||
}
|
|
||||||
|
|
||||||
rsp->set_status(0);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcSendTextMsg(CallbackServerContext *context, const TextMsg *msg, Response *rsp) override
|
|
||||||
{
|
|
||||||
wstring wswxid = String2Wstring(msg->receiver());
|
|
||||||
wstring wsmsg = String2Wstring(msg->msg());
|
|
||||||
wstring wsatusers = String2Wstring(msg->aters());
|
|
||||||
|
|
||||||
SendTextMessage(wswxid.c_str(), wsmsg.c_str(), wsatusers.c_str());
|
|
||||||
rsp->set_status(0);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcSendImageMsg(CallbackServerContext *context, const ImageMsg *msg, Response *rsp) override
|
|
||||||
{
|
|
||||||
wstring wswxid = String2Wstring(msg->receiver());
|
|
||||||
wstring wspath = String2Wstring(msg->path());
|
|
||||||
|
|
||||||
SendImageMessage(wswxid.c_str(), wspath.c_str());
|
|
||||||
rsp->set_status(0);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcGetMsgTypes(CallbackServerContext *context, const Empty *empty, MsgTypes *rsp) override
|
|
||||||
{
|
|
||||||
GetMsgTypes(rsp);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcGetContacts(CallbackServerContext *context, const Empty *empty, Contacts *rsp) override
|
|
||||||
{
|
|
||||||
bool ret = GetContacts(rsp);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
if (ret) {
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
} else {
|
|
||||||
reactor->Finish(Status::CANCELLED);
|
|
||||||
}
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcGetDbNames(CallbackServerContext *context, const Empty *empty, DbNames *rsp) override
|
|
||||||
{
|
|
||||||
GetDbNames(rsp);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcGetDbTables(CallbackServerContext *context, const String *db, DbTables *rsp) override
|
|
||||||
{
|
|
||||||
GetDbTables(db->str(), rsp);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcExecDbQuery(CallbackServerContext *context, const DbQuery *query, DbRows *rsp) override
|
|
||||||
{
|
|
||||||
ExecDbQuery(query->db(), query->sql(), rsp);
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
|
|
||||||
ServerUnaryReactor *RpcAcceptNewFriend(CallbackServerContext *context, const Verification *v,
|
|
||||||
Response *rsp) override
|
|
||||||
{
|
|
||||||
bool ret = AcceptNewFriend(String2Wstring(v->v3()), String2Wstring(v->v4()));
|
|
||||||
auto *reactor = context->DefaultReactor();
|
|
||||||
if (ret) {
|
|
||||||
rsp->set_status(0);
|
|
||||||
reactor->Finish(Status::OK);
|
|
||||||
} else {
|
|
||||||
LOG_ERROR("AcceptNewFriend failed.")
|
|
||||||
rsp->set_status(-1); // TODO: Unify error code
|
|
||||||
reactor->Finish(Status::CANCELLED);
|
|
||||||
}
|
|
||||||
|
|
||||||
return reactor;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static DWORD lThreadId = 0;
|
static DWORD lThreadId = 0;
|
||||||
static bool lIsRunning = false;
|
static bool lIsRunning = false;
|
||||||
static ServerBuilder lBuilder;
|
static nng_socket sock;
|
||||||
static WcfImpl lService;
|
static uint8_t gBuffer[1024 * 1024] = { 0 };
|
||||||
|
|
||||||
static unique_ptr<Server> &GetServer()
|
static void LogBuffer(uint8_t *buffer, size_t len)
|
||||||
{
|
{
|
||||||
static unique_ptr<Server> server(lBuilder.BuildAndStart());
|
int j = 0;
|
||||||
|
char buf[1024] = { 0 };
|
||||||
|
j = sprintf_s(buf, 1024, "Encoded message: ");
|
||||||
|
for (size_t i = 0; i < len; i++) {
|
||||||
|
j += sprintf_s(buf + j, 1024, "%02X ", buffer[i]);
|
||||||
|
}
|
||||||
|
LOG_INFO(buf);
|
||||||
|
}
|
||||||
|
|
||||||
return server;
|
bool func_is_login(uint8_t *out, size_t *len)
|
||||||
|
{
|
||||||
|
Response rsp = Response_init_default;
|
||||||
|
rsp.func = Functions_FUNC_IS_LOGIN;
|
||||||
|
rsp.which_msg = Response_status_tag;
|
||||||
|
rsp.msg.status = IsLogin();
|
||||||
|
if (!pb_get_encoded_size(len, Response_fields, &rsp)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pb_ostream_t stream = pb_ostream_from_buffer(out, *len);
|
||||||
|
if (!pb_encode(&stream, Response_fields, &rsp)) {
|
||||||
|
printf("Encoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool func_get_self_wxid(uint8_t *out, size_t *len)
|
||||||
|
{
|
||||||
|
Response rsp = Response_init_default;
|
||||||
|
rsp.func = Functions_FUNC_IS_LOGIN;
|
||||||
|
rsp.which_msg = Response_str_tag;
|
||||||
|
rsp.msg.str = (char *)GetSelfWxid().c_str();
|
||||||
|
if (!pb_get_encoded_size(len, Response_fields, &rsp)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
pb_ostream_t stream = pb_ostream_from_buffer(out, *len);
|
||||||
|
if (!pb_encode(&stream, Response_fields, &rsp)) {
|
||||||
|
printf("Encoding failed: %s\n", PB_GET_ERROR(&stream));
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool dispatcher(uint8_t *in, size_t in_len, uint8_t *out, size_t *out_len)
|
||||||
|
{
|
||||||
|
bool ret = false;
|
||||||
|
Request req = Request_init_default;
|
||||||
|
pb_istream_t stream = pb_istream_from_buffer(in, in_len);
|
||||||
|
if (!pb_decode(&stream, Request_fields, &req)) {
|
||||||
|
LOG_ERROR("Decoding failed: {}", PB_GET_ERROR(&stream));
|
||||||
|
pb_release(Request_fields, &req);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_INFO("Func: {}", (uint8_t)req.func);
|
||||||
|
switch (req.func) {
|
||||||
|
case Functions_FUNC_IS_LOGIN: {
|
||||||
|
LOG_INFO("[Functions_FUNC_IS_LOGIN]");
|
||||||
|
ret = func_is_login(out, out_len);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
case Functions_FUNC_GET_SELF_WXID: {
|
||||||
|
LOG_INFO("[Functions_FUNC_GET_SELF_WXID]");
|
||||||
|
ret = func_get_self_wxid(out, out_len);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
default: {
|
||||||
|
LOG_ERROR("[UNKNOW FUNCTION]");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pb_release(Request_fields, &req);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int RunServer()
|
static int RunServer()
|
||||||
{
|
{
|
||||||
string server_address("0.0.0.0:10086");
|
int rv = 0;
|
||||||
|
char *url = (char *)"tcp://0.0.0.0:10086";
|
||||||
|
if ((rv = nng_pair1_open(&sock)) != 0) {
|
||||||
|
LOG_ERROR("nng_pair0_open error {}", rv);
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((rv = nng_listen(sock, url, NULL, 0)) != 0) {
|
||||||
|
LOG_ERROR("nng_listen error {}", rv);
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
|
LOG_INFO("Server listening on {}", url);
|
||||||
|
if ((rv = nng_setopt_ms(sock, NNG_OPT_SENDTIMEO, 1000)) != 0) {
|
||||||
|
LOG_ERROR("nng_recv: {}", rv);
|
||||||
|
return rv;
|
||||||
|
}
|
||||||
|
|
||||||
lBuilder.AddListeningPort(server_address, grpc::InsecureServerCredentials());
|
|
||||||
lBuilder.AddChannelArgument(GRPC_ARG_KEEPALIVE_TIME_MS, 2000);
|
|
||||||
lBuilder.AddChannelArgument(GRPC_ARG_KEEPALIVE_TIMEOUT_MS, 3000);
|
|
||||||
lBuilder.AddChannelArgument(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, 1);
|
|
||||||
lBuilder.RegisterService(&lService);
|
|
||||||
|
|
||||||
unique_ptr<Server> &server = GetServer();
|
|
||||||
LOG_INFO("Server listening on {}", server_address);
|
|
||||||
LOG_DEBUG("server: {}", fmt::ptr(server));
|
|
||||||
lIsRunning = true;
|
lIsRunning = true;
|
||||||
server->Wait();
|
while (lIsRunning) {
|
||||||
|
uint8_t *in = NULL;
|
||||||
|
size_t in_len, out_len;
|
||||||
|
if ((rv = nng_recv(sock, &in, &in_len, NNG_FLAG_ALLOC)) != 0) {
|
||||||
|
LOG_ERROR("nng_recv: {}", rv);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
LogBuffer(in, in_len);
|
||||||
|
if (dispatcher(in, in_len, gBuffer, &out_len)) {
|
||||||
|
LogBuffer(gBuffer, out_len);
|
||||||
|
rv = nng_send(sock, gBuffer, out_len, 0);
|
||||||
|
if (rv != 0) {
|
||||||
|
LOG_ERROR("nng_send: {}", rv);
|
||||||
|
}
|
||||||
|
|
||||||
return 0;
|
} else {
|
||||||
|
// Error
|
||||||
|
LOG_ERROR("Dispatcher failed...");
|
||||||
|
rv = nng_send(sock, gBuffer, 0, 0);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
nng_free(in, in_len);
|
||||||
|
}
|
||||||
|
LOG_INFO("Leave RunServer");
|
||||||
|
return rv;
|
||||||
}
|
}
|
||||||
|
|
||||||
int RpcStartServer()
|
int RpcStartServer()
|
||||||
{
|
{
|
||||||
if (lIsRunning) {
|
if (lIsRunning) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
HANDLE rpcThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RunServer, NULL, NULL, &lThreadId);
|
HANDLE rpcThread = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE)RunServer, NULL, NULL, &lThreadId);
|
||||||
if (rpcThread != 0) {
|
if (rpcThread != 0) {
|
||||||
@ -276,21 +186,11 @@ int RpcStartServer()
|
|||||||
|
|
||||||
int RpcStopServer()
|
int RpcStopServer()
|
||||||
{
|
{
|
||||||
if (lIsRunning) {
|
if (lIsRunning) {
|
||||||
Empty empty;
|
nng_close(sock);
|
||||||
Response rsp;
|
// UnListenMessage(); // Do it in RpcDisableRecvMsg
|
||||||
CallbackServerContext context;
|
LOG_INFO("Server stoped.");
|
||||||
|
|
||||||
unique_ptr<Server> &server = GetServer();
|
|
||||||
LOG_DEBUG("server: {}", fmt::ptr(server));
|
|
||||||
if (gIsListening) {
|
|
||||||
//UnListenMessage(); // Do it in RpcDisableRecvMsg
|
|
||||||
lService.RpcDisableRecvMsg(&context, &empty, &rsp);
|
|
||||||
}
|
|
||||||
server->Shutdown();
|
|
||||||
LOG_INFO("Server stoped.");
|
|
||||||
lIsRunning = false;
|
lIsRunning = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include "framework.h"
|
#include "framework.h"
|
||||||
#include "../proto/wcf.grpc.pb.h"
|
|
||||||
|
|
||||||
typedef struct UserInfoCall {
|
typedef struct UserInfoCall {
|
||||||
DWORD wxid;
|
DWORD wxid;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user