summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Wasilczyk <twasilczyk@pidgin.im>2015-05-09 14:54:05 +0200
committerTomasz Wasilczyk <twasilczyk@pidgin.im>2015-05-09 14:54:05 +0200
commit96e2668bcf76945ab896a404fe95f936cd806b3a (patch)
tree4f66bf66decfc05926e3cfbb4c0c4ec3be932d90
parent8f2f9ec7b4041d8653c68dda65e9c11e0a94aa4f (diff)
downloadpidgin-96e2668bcf76945ab896a404fe95f936cd806b3a.tar.gz
Update internal libgadu to 1.12.1
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--libpurple/protocols/gg/lib/config.h2
-rw-r--r--libpurple/protocols/gg/lib/dcc.c11
-rw-r--r--libpurple/protocols/gg/lib/handlers.c74
-rw-r--r--libpurple/protocols/gg/lib/libgadu.c3
-rw-r--r--libpurple/protocols/gg/lib/packets.pb-c.c839
-rw-r--r--libpurple/protocols/gg/lib/packets.pb-c.h106
-rw-r--r--libpurple/protocols/gg/lib/protobuf-c.c5450
-rw-r--r--libpurple/protocols/gg/lib/protobuf-c.h1466
-rw-r--r--libpurple/protocols/gg/lib/protobuf.h2
-rw-r--r--libpurple/protocols/gg/lib/protocol.h6
-rw-r--r--libpurple/protocols/gg/lib/pubdir50.c2
-rw-r--r--libpurple/protocols/gg/lib/sha1.c12
13 files changed, 4735 insertions, 3241 deletions
diff --git a/ChangeLog b/ChangeLog
index 88c4220bac..81560f30f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,9 @@ version 2.10.12 (MM/DD/YY):
* SILC 1.1.12
* Remove support for Tcl plugins
+ Gadu-Gadu:
+ * Updated internal libgadu to version 1.12.1.
+
version 2.10.11 (11/23/14):
General:
* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
diff --git a/libpurple/protocols/gg/lib/config.h b/libpurple/protocols/gg/lib/config.h
index 1d29bb0e79..fdf7f51e9d 100644
--- a/libpurple/protocols/gg/lib/config.h
+++ b/libpurple/protocols/gg/lib/config.h
@@ -5,7 +5,7 @@
/* libpurple's config */
#include <config.h>
-#define GG_LIBGADU_VERSION "1.12.0"
+#define GG_LIBGADU_VERSION "1.12.1"
/* Defined if libgadu was compiled for bigendian machine. */
#undef GG_CONFIG_BIGENDIAN
diff --git a/libpurple/protocols/gg/lib/dcc.c b/libpurple/protocols/gg/lib/dcc.c
index e76524b18d..14f8bb420a 100644
--- a/libpurple/protocols/gg/lib/dcc.c
+++ b/libpurple/protocols/gg/lib/dcc.c
@@ -650,6 +650,7 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
unsigned int utmp;
socklen_t res_size = sizeof(res);
char buf[1024], ack[] = "UDAG";
+ void *tmp_buf;
struct gg_dcc_file_info_packet {
struct gg_dcc_big_packet big;
@@ -799,11 +800,14 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
h->state = GG_STATE_READING_FILE_HEADER;
h->chunk_size = sizeof(big_pkt);
h->chunk_offset = 0;
- if (!(h->chunk_buf = malloc(sizeof(big_pkt)))) {
+ h->chunk_buf = NULL;
+ tmp_buf = malloc(sizeof(big_pkt));
+ if (!tmp_buf) {
gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() out of memory\n");
free(e);
return NULL;
}
+ h->chunk_buf = tmp_buf;
h->check = GG_CHECK_READ;
h->timeout = GG_DEFAULT_TIMEOUT;
@@ -1342,11 +1346,14 @@ struct gg_event *gg_dcc_watch_fd(struct gg_dcc *h)
h->timeout = GG_DEFAULT_TIMEOUT;
h->chunk_offset = 0;
h->chunk_size = sizeof(big_pkt);
- if (!(h->chunk_buf = malloc(sizeof(big_pkt)))) {
+ h->chunk_buf = NULL;
+ tmp_buf = malloc(sizeof(big_pkt));
+ if (!tmp_buf) {
gg_debug(GG_DEBUG_MISC, "// gg_dcc_watch_fd() out of memory\n");
free(e);
return NULL;
}
+ h->chunk_buf = tmp_buf;
} else {
h->state = GG_STATE_GETTING_FILE;
h->timeout = GG_DCC_TIMEOUT_GET;
diff --git a/libpurple/protocols/gg/lib/handlers.c b/libpurple/protocols/gg/lib/handlers.c
index 2dd735103e..e8d2c37ee6 100644
--- a/libpurple/protocols/gg/lib/handlers.c
+++ b/libpurple/protocols/gg/lib/handlers.c
@@ -48,6 +48,10 @@
#include <string.h>
#include <time.h>
+/* Ograniczenie długości listy kontaktów
+ * z pakietów GG_USERLIST_REPLY do 10MB. */
+#define GG_USERLIST_REPLY_MAX_LENGTH 10485760
+
/**
* \internal Struktura opisująca funkcję obsługi pakietu.
*/
@@ -631,6 +635,13 @@ static int gg_session_handle_userlist_reply(struct gg_session *gs,
gg_debug_session(gs, GG_DEBUG_MISC, "userlist_reply=%p, len=%"
GG_SIZE_FMT "\n", gs->userlist_reply, len);
+ if (reply_len + len > GG_USERLIST_REPLY_MAX_LENGTH) {
+ gg_debug_session(gs, GG_DEBUG_MISC,
+ "// gg_session_handle_userlist_reply() "
+ "too many userlist replies\n");
+ return -1;
+ }
+
tmp = realloc(gs->userlist_reply, reply_len + len);
if (tmp == NULL) {
@@ -1737,7 +1748,7 @@ static int gg_session_handle_notify_reply_80(struct gg_session *gs,
while (length >= sizeof(struct gg_notify_reply80)) {
uin_t uin = gg_fix32(n->uin);
int descr_len;
- char *tmp;
+ void *tmp;
ge->event.notify60[i].uin = uin;
ge->event.notify60[i].status = gg_fix32(n->status);
@@ -1782,7 +1793,7 @@ static int gg_session_handle_notify_reply_80(struct gg_session *gs,
return -1;
}
- ge->event.notify60 = (void*) tmp;
+ ge->event.notify60 = tmp;
ge->event.notify60[++i].uin = 0;
}
@@ -1814,7 +1825,7 @@ static int gg_session_handle_notify_reply_77_80beta(struct gg_session *gs,
while (length >= sizeof(struct gg_notify_reply77)) {
uin_t uin = gg_fix32(n->uin);
- char *tmp;
+ void *tmp;
ge->event.notify60[i].uin = uin & 0x00ffffff;
ge->event.notify60[i].status = n->status;
@@ -1867,7 +1878,7 @@ static int gg_session_handle_notify_reply_77_80beta(struct gg_session *gs,
return -1;
}
- ge->event.notify60 = (void*) tmp;
+ ge->event.notify60 = tmp;
ge->event.notify60[++i].uin = 0;
}
@@ -1899,7 +1910,7 @@ static int gg_session_handle_notify_reply_60(struct gg_session *gs,
while (length >= sizeof(struct gg_notify_reply60)) {
uin_t uin = gg_fix32(n->uin);
- char *tmp;
+ void *tmp;
ge->event.notify60[i].uin = uin & 0x00ffffff;
ge->event.notify60[i].status = n->status;
@@ -1954,7 +1965,7 @@ static int gg_session_handle_notify_reply_60(struct gg_session *gs,
return -1;
}
- ge->event.notify60 = (void*) tmp;
+ ge->event.notify60 = tmp;
ge->event.notify60[++i].uin = 0;
}
@@ -2360,18 +2371,20 @@ static int gg_session_handle_imtoken(struct gg_session *gs, uint32_t type,
static int gg_session_handle_pong_110(struct gg_session *gs, uint32_t type,
const char *ptr, size_t len, struct gg_event *ge)
{
- const struct gg_pong110 *pong = (const struct gg_pong110*)ptr;
- uint32_t server_time;
+ GG110Pong *msg = gg110_pong__unpack(NULL, len, (uint8_t*)ptr);
+
+ if (!GG_PROTOBUF_VALID(gs, "GG110Pong", msg))
+ return -1;
gg_debug_session(gs, GG_DEBUG_MISC, "// gg_watch_fd_connected() "
"received pong110\n");
- server_time = gg_fix32(pong->time);
-
ge->type = GG_EVENT_PONG110;
- ge->event.pong110.time = server_time;
+ ge->event.pong110.time = msg->server_time;
- gg_sync_time(gs, server_time);
+ gg_sync_time(gs, msg->server_time);
+
+ gg110_pong__free_unpacked(msg, NULL);
return 0;
}
@@ -2653,7 +2666,12 @@ static int gg_session_handle_transfer_info(struct gg_session *gs, uint32_t type,
if (!GG_PROTOBUF_VALID(gs, "GG112TransferInfo", msg))
return -1;
- gg_protobuf_expected(gs, "GG112TransferInfo.dummy1", msg->dummy1, 6);
+ /* see packets.proto */
+ if (msg->dummy1 != 5 && msg->dummy1 != 6) {
+ gg_debug_session(gs, GG_DEBUG_MISC | GG_DEBUG_WARNING,
+ "// gg_session_handle_transfer_info: "
+ "unknown dummy1 value: %d\n", msg->dummy1);
+ }
if (GG_PROTOBUF_VALID(gs, "GG112TransferInfoUin", msg->peer)) {
gg_protobuf_expected(gs, "GG112TransferInfoUin.dummy1",
@@ -2682,7 +2700,7 @@ static int gg_session_handle_transfer_info(struct gg_session *gs, uint32_t type,
kvp->key, kvp->value);
}
- if (GG_PROTOBUF_VALID(gs, "GG112TransferInfoFile", msg->file)) {
+ if (msg->file && GG_PROTOBUF_VALID(gs, "GG112TransferInfoFile", msg->file)) {
GG112TransferInfoFile *file = msg->file;
gg_debug_session(gs, GG_DEBUG_MISC,
"// gg_session_handle_transfer_info file: "
@@ -2700,6 +2718,29 @@ static int gg_session_handle_transfer_info(struct gg_session *gs, uint32_t type,
return succ ? 0 : -1;
}
+static int gg_session_handle_magic_notification(struct gg_session *gs, uint32_t type,
+ const char *ptr, size_t len, struct gg_event *ge)
+{
+ GG110MagicNotification *msg = gg110_magic_notification__unpack(NULL, len, (uint8_t*)ptr);
+ int succ = 1;
+
+ if (!GG_PROTOBUF_VALID(gs, "GG110MagicNotification", msg))
+ return -1;
+
+ gg_debug_session(gs, GG_DEBUG_MISC,
+ "// gg_session_handle_magic_notification \n");
+
+ gg_protobuf_expected(gs, "GG110MagicNotification.dummy1", msg->dummy1, 2);
+ gg_protobuf_expected(gs, "GG110MagicNotification.dummy2", msg->dummy2, 1);
+ gg_protobuf_expected(gs, "GG110MagicNotification.dummy3", msg->dummy3, 1);
+
+ succ = (gg_ack_110(gs, GG110_ACK__TYPE__MAGIC_NOTIFICATION, msg->seq, ge) == 0);
+
+ gg110_magic_notification__free_unpacked(msg, NULL);
+
+ return succ ? 0 : -1;
+}
+
/**
* \internal Tablica obsługiwanych pakietów
*/
@@ -2749,7 +2790,7 @@ static const gg_packet_handler_t handlers[] =
{ GG_USERLIST100_VERSION, GG_STATE_CONNECTED, sizeof(struct gg_userlist100_version), gg_session_handle_userlist_100_version },
{ GG_USERLIST100_REPLY, GG_STATE_CONNECTED, sizeof(struct gg_userlist100_reply), gg_session_handle_userlist_100_reply },
{ GG_IMTOKEN, GG_STATE_CONNECTED, 0, gg_session_handle_imtoken },
- { GG_PONG110, GG_STATE_CONNECTED, sizeof(struct gg_pong110), gg_session_handle_pong_110 },
+ { GG_PONG110, GG_STATE_CONNECTED, 0, gg_session_handle_pong_110 },
{ GG_CHAT_INFO, GG_STATE_CONNECTED, 0, gg_session_handle_chat_info },
{ GG_CHAT_INFO_UPDATE, GG_STATE_CONNECTED, 0, gg_session_handle_chat_info_update },
{ GG_CHAT_CREATED, GG_STATE_CONNECTED, sizeof(struct gg_chat_created), gg_session_handle_chat_created },
@@ -2760,7 +2801,8 @@ static const gg_packet_handler_t handlers[] =
{ GG_OPTIONS, GG_STATE_CONNECTED, 0, gg_session_handle_options },
{ GG_ACCESS_INFO, GG_STATE_CONNECTED, 0, gg_session_handle_access_info },
{ GG_UIN_INFO, GG_STATE_CONNECTED, 0, gg_session_handle_uin_info },
- { GG_TRANSFER_INFO, GG_STATE_CONNECTED, 0, gg_session_handle_transfer_info }
+ { GG_TRANSFER_INFO, GG_STATE_CONNECTED, 0, gg_session_handle_transfer_info },
+ { GG_MAGIC_NOTIFICATION, GG_STATE_CONNECTED, 0, gg_session_handle_magic_notification }
/* style:maxlinelength:end-ignore */
};
diff --git a/libpurple/protocols/gg/lib/libgadu.c b/libpurple/protocols/gg/lib/libgadu.c
index 0e362b2b4b..fb3dd43e00 100644
--- a/libpurple/protocols/gg/lib/libgadu.c
+++ b/libpurple/protocols/gg/lib/libgadu.c
@@ -2123,7 +2123,6 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
struct gg_send_msg s;
const char *tmp;
char buf[1910];
- int res = -1;
gg_imgout_queue_t *queue = NULL, *queue_end = NULL;
gg_debug_session(sess, GG_DEBUG_FUNCTION, "** gg_image_reply(%p, %d, "
@@ -2212,7 +2211,7 @@ int gg_image_reply(struct gg_session *sess, uin_t recipient, const char *filenam
}
gg_image_sendout(sess);
- return res;
+ return 0;
}
void gg_image_sendout(struct gg_session *sess)
diff --git a/libpurple/protocols/gg/lib/packets.pb-c.c b/libpurple/protocols/gg/lib/packets.pb-c.c
index 1fe1fabb90..c42e35e572 100644
--- a/libpurple/protocols/gg/lib/packets.pb-c.c
+++ b/libpurple/protocols/gg/lib/packets.pb-c.c
@@ -1,8 +1,9 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: packets.proto */
/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C_NO_DEPRECATED
-#define PROTOBUF_C_NO_DEPRECATED
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
#endif
#include "packets.pb-c.h"
@@ -15,21 +16,21 @@ void gg110_login_ok__init
size_t gg110_login_ok__get_packed_size
(const GG110LoginOK *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_login_ok__descriptor);
+ assert(message->base.descriptor == &gg110_login_ok__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_login_ok__pack
(const GG110LoginOK *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_login_ok__descriptor);
+ assert(message->base.descriptor == &gg110_login_ok__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_login_ok__pack_to_buffer
(const GG110LoginOK *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_login_ok__descriptor);
+ assert(message->base.descriptor == &gg110_login_ok__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110LoginOK *
@@ -46,7 +47,50 @@ void gg110_login_ok__free_unpacked
(GG110LoginOK *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_login_ok__descriptor);
+ assert(message->base.descriptor == &gg110_login_ok__descriptor);
+ protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+void gg110_pong__init
+ (GG110Pong *message)
+{
+ static GG110Pong init_value = GG110_PONG__INIT;
+ *message = init_value;
+}
+size_t gg110_pong__get_packed_size
+ (const GG110Pong *message)
+{
+ assert(message->base.descriptor == &gg110_pong__descriptor);
+ return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t gg110_pong__pack
+ (const GG110Pong *message,
+ uint8_t *out)
+{
+ assert(message->base.descriptor == &gg110_pong__descriptor);
+ return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t gg110_pong__pack_to_buffer
+ (const GG110Pong *message,
+ ProtobufCBuffer *buffer)
+{
+ assert(message->base.descriptor == &gg110_pong__descriptor);
+ return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+GG110Pong *
+ gg110_pong__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data)
+{
+ return (GG110Pong *)
+ protobuf_c_message_unpack (&gg110_pong__descriptor,
+ allocator, len, data);
+}
+void gg110_pong__free_unpacked
+ (GG110Pong *message,
+ ProtobufCAllocator *allocator)
+{
+ assert(message->base.descriptor == &gg110_pong__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_ack__init
@@ -58,21 +102,21 @@ void gg110_ack__init
size_t gg110_ack__get_packed_size
(const GG110Ack *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_ack__descriptor);
+ assert(message->base.descriptor == &gg110_ack__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_ack__pack
(const GG110Ack *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_ack__descriptor);
+ assert(message->base.descriptor == &gg110_ack__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_ack__pack_to_buffer
(const GG110Ack *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_ack__descriptor);
+ assert(message->base.descriptor == &gg110_ack__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110Ack *
@@ -89,7 +133,7 @@ void gg110_ack__free_unpacked
(GG110Ack *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_ack__descriptor);
+ assert(message->base.descriptor == &gg110_ack__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg105_login__init
@@ -101,21 +145,21 @@ void gg105_login__init
size_t gg105_login__get_packed_size
(const GG105Login *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg105_login__descriptor);
+ assert(message->base.descriptor == &gg105_login__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg105_login__pack
(const GG105Login *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg105_login__descriptor);
+ assert(message->base.descriptor == &gg105_login__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg105_login__pack_to_buffer
(const GG105Login *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg105_login__descriptor);
+ assert(message->base.descriptor == &gg105_login__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG105Login *
@@ -132,7 +176,7 @@ void gg105_login__free_unpacked
(GG105Login *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg105_login__descriptor);
+ assert(message->base.descriptor == &gg105_login__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_message_ack_link__init
@@ -144,21 +188,21 @@ void gg110_message_ack_link__init
size_t gg110_message_ack_link__get_packed_size
(const GG110MessageAckLink *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack_link__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack_link__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_message_ack_link__pack
(const GG110MessageAckLink *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack_link__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack_link__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_message_ack_link__pack_to_buffer
(const GG110MessageAckLink *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack_link__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack_link__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110MessageAckLink *
@@ -175,7 +219,7 @@ void gg110_message_ack_link__free_unpacked
(GG110MessageAckLink *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack_link__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack_link__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_message_ack__init
@@ -187,21 +231,21 @@ void gg110_message_ack__init
size_t gg110_message_ack__get_packed_size
(const GG110MessageAck *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_message_ack__pack
(const GG110MessageAck *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_message_ack__pack_to_buffer
(const GG110MessageAck *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110MessageAck *
@@ -218,7 +262,7 @@ void gg110_message_ack__free_unpacked
(GG110MessageAck *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_message_ack__descriptor);
+ assert(message->base.descriptor == &gg110_message_ack__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_event__init
@@ -230,21 +274,21 @@ void gg110_event__init
size_t gg110_event__get_packed_size
(const GG110Event *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_event__descriptor);
+ assert(message->base.descriptor == &gg110_event__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_event__pack
(const GG110Event *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_event__descriptor);
+ assert(message->base.descriptor == &gg110_event__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_event__pack_to_buffer
(const GG110Event *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_event__descriptor);
+ assert(message->base.descriptor == &gg110_event__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110Event *
@@ -261,7 +305,7 @@ void gg110_event__free_unpacked
(GG110Event *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_event__descriptor);
+ assert(message->base.descriptor == &gg110_event__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_recv_message__init
@@ -273,21 +317,21 @@ void gg110_recv_message__init
size_t gg110_recv_message__get_packed_size
(const GG110RecvMessage *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_recv_message__descriptor);
+ assert(message->base.descriptor == &gg110_recv_message__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_recv_message__pack
(const GG110RecvMessage *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_recv_message__descriptor);
+ assert(message->base.descriptor == &gg110_recv_message__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_recv_message__pack_to_buffer
(const GG110RecvMessage *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_recv_message__descriptor);
+ assert(message->base.descriptor == &gg110_recv_message__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110RecvMessage *
@@ -304,7 +348,7 @@ void gg110_recv_message__free_unpacked
(GG110RecvMessage *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_recv_message__descriptor);
+ assert(message->base.descriptor == &gg110_recv_message__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_send_message__init
@@ -316,21 +360,21 @@ void gg110_send_message__init
size_t gg110_send_message__get_packed_size
(const GG110SendMessage *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_send_message__descriptor);
+ assert(message->base.descriptor == &gg110_send_message__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_send_message__pack
(const GG110SendMessage *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_send_message__descriptor);
+ assert(message->base.descriptor == &gg110_send_message__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_send_message__pack_to_buffer
(const GG110SendMessage *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_send_message__descriptor);
+ assert(message->base.descriptor == &gg110_send_message__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110SendMessage *
@@ -347,7 +391,7 @@ void gg110_send_message__free_unpacked
(GG110SendMessage *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_send_message__descriptor);
+ assert(message->base.descriptor == &gg110_send_message__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_imtoken__init
@@ -359,21 +403,21 @@ void gg110_imtoken__init
size_t gg110_imtoken__get_packed_size
(const GG110Imtoken *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_imtoken__descriptor);
+ assert(message->base.descriptor == &gg110_imtoken__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_imtoken__pack
(const GG110Imtoken *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_imtoken__descriptor);
+ assert(message->base.descriptor == &gg110_imtoken__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_imtoken__pack_to_buffer
(const GG110Imtoken *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_imtoken__descriptor);
+ assert(message->base.descriptor == &gg110_imtoken__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110Imtoken *
@@ -390,7 +434,7 @@ void gg110_imtoken__free_unpacked
(GG110Imtoken *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_imtoken__descriptor);
+ assert(message->base.descriptor == &gg110_imtoken__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_chat_info_update__init
@@ -402,21 +446,21 @@ void gg110_chat_info_update__init
size_t gg110_chat_info_update__get_packed_size
(const GG110ChatInfoUpdate *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_chat_info_update__descriptor);
+ assert(message->base.descriptor == &gg110_chat_info_update__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_chat_info_update__pack
(const GG110ChatInfoUpdate *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_chat_info_update__descriptor);
+ assert(message->base.descriptor == &gg110_chat_info_update__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_chat_info_update__pack_to_buffer
(const GG110ChatInfoUpdate *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_chat_info_update__descriptor);
+ assert(message->base.descriptor == &gg110_chat_info_update__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110ChatInfoUpdate *
@@ -433,7 +477,7 @@ void gg110_chat_info_update__free_unpacked
(GG110ChatInfoUpdate *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_chat_info_update__descriptor);
+ assert(message->base.descriptor == &gg110_chat_info_update__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void protobuf_kvp__init
@@ -445,21 +489,21 @@ void protobuf_kvp__init
size_t protobuf_kvp__get_packed_size
(const ProtobufKVP *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &protobuf_kvp__descriptor);
+ assert(message->base.descriptor == &protobuf_kvp__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t protobuf_kvp__pack
(const ProtobufKVP *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &protobuf_kvp__descriptor);
+ assert(message->base.descriptor == &protobuf_kvp__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t protobuf_kvp__pack_to_buffer
(const ProtobufKVP *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &protobuf_kvp__descriptor);
+ assert(message->base.descriptor == &protobuf_kvp__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
ProtobufKVP *
@@ -476,7 +520,7 @@ void protobuf_kvp__free_unpacked
(ProtobufKVP *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &protobuf_kvp__descriptor);
+ assert(message->base.descriptor == &protobuf_kvp__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_options__init
@@ -488,21 +532,21 @@ void gg110_options__init
size_t gg110_options__get_packed_size
(const GG110Options *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_options__descriptor);
+ assert(message->base.descriptor == &gg110_options__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_options__pack
(const GG110Options *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_options__descriptor);
+ assert(message->base.descriptor == &gg110_options__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_options__pack_to_buffer
(const GG110Options *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_options__descriptor);
+ assert(message->base.descriptor == &gg110_options__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110Options *
@@ -519,7 +563,7 @@ void gg110_options__free_unpacked
(GG110Options *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_options__descriptor);
+ assert(message->base.descriptor == &gg110_options__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg110_access_info__init
@@ -531,21 +575,21 @@ void gg110_access_info__init
size_t gg110_access_info__get_packed_size
(const GG110AccessInfo *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_access_info__descriptor);
+ assert(message->base.descriptor == &gg110_access_info__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg110_access_info__pack
(const GG110AccessInfo *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_access_info__descriptor);
+ assert(message->base.descriptor == &gg110_access_info__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg110_access_info__pack_to_buffer
(const GG110AccessInfo *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_access_info__descriptor);
+ assert(message->base.descriptor == &gg110_access_info__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG110AccessInfo *
@@ -562,7 +606,7 @@ void gg110_access_info__free_unpacked
(GG110AccessInfo *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg110_access_info__descriptor);
+ assert(message->base.descriptor == &gg110_access_info__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg112_transfer_info_uin__init
@@ -574,21 +618,21 @@ void gg112_transfer_info_uin__init
size_t gg112_transfer_info_uin__get_packed_size
(const GG112TransferInfoUin *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_uin__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_uin__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg112_transfer_info_uin__pack
(const GG112TransferInfoUin *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_uin__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_uin__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg112_transfer_info_uin__pack_to_buffer
(const GG112TransferInfoUin *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_uin__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_uin__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG112TransferInfoUin *
@@ -605,7 +649,7 @@ void gg112_transfer_info_uin__free_unpacked
(GG112TransferInfoUin *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_uin__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_uin__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg112_transfer_info_file__init
@@ -617,21 +661,21 @@ void gg112_transfer_info_file__init
size_t gg112_transfer_info_file__get_packed_size
(const GG112TransferInfoFile *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_file__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_file__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg112_transfer_info_file__pack
(const GG112TransferInfoFile *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_file__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_file__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg112_transfer_info_file__pack_to_buffer
(const GG112TransferInfoFile *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_file__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_file__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG112TransferInfoFile *
@@ -648,7 +692,7 @@ void gg112_transfer_info_file__free_unpacked
(GG112TransferInfoFile *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info_file__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info_file__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
void gg112_transfer_info__init
@@ -660,21 +704,21 @@ void gg112_transfer_info__init
size_t gg112_transfer_info__get_packed_size
(const GG112TransferInfo *message)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info__descriptor);
return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
}
size_t gg112_transfer_info__pack
(const GG112TransferInfo *message,
uint8_t *out)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info__descriptor);
return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
}
size_t gg112_transfer_info__pack_to_buffer
(const GG112TransferInfo *message,
ProtobufCBuffer *buffer)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info__descriptor);
return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
}
GG112TransferInfo *
@@ -691,7 +735,50 @@ void gg112_transfer_info__free_unpacked
(GG112TransferInfo *message,
ProtobufCAllocator *allocator)
{
- PROTOBUF_C_ASSERT (message->base.descriptor == &gg112_transfer_info__descriptor);
+ assert(message->base.descriptor == &gg112_transfer_info__descriptor);
+ protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+void gg110_magic_notification__init
+ (GG110MagicNotification *message)
+{
+ static GG110MagicNotification init_value = GG110_MAGIC_NOTIFICATION__INIT;
+ *message = init_value;
+}
+size_t gg110_magic_notification__get_packed_size
+ (const GG110MagicNotification *message)
+{
+ assert(message->base.descriptor == &gg110_magic_notification__descriptor);
+ return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t gg110_magic_notification__pack
+ (const GG110MagicNotification *message,
+ uint8_t *out)
+{
+ assert(message->base.descriptor == &gg110_magic_notification__descriptor);
+ return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t gg110_magic_notification__pack_to_buffer
+ (const GG110MagicNotification *message,
+ ProtobufCBuffer *buffer)
+{
+ assert(message->base.descriptor == &gg110_magic_notification__descriptor);
+ return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+GG110MagicNotification *
+ gg110_magic_notification__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data)
+{
+ return (GG110MagicNotification *)
+ protobuf_c_message_unpack (&gg110_magic_notification__descriptor,
+ allocator, len, data);
+}
+void gg110_magic_notification__free_unpacked
+ (GG110MagicNotification *message,
+ ProtobufCAllocator *allocator)
+{
+ assert(message->base.descriptor == &gg110_magic_notification__descriptor);
protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
}
static const int32_t gg110_login_ok__dummy1__default_value = 1;
@@ -703,10 +790,10 @@ static const ProtobufCFieldDescriptor gg110_login_ok__field_descriptors[4] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110LoginOK, dummy1),
+ offsetof(GG110LoginOK, dummy1),
NULL,
&gg110_login_ok__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -715,10 +802,10 @@ static const ProtobufCFieldDescriptor gg110_login_ok__field_descriptors[4] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110LoginOK, dummyhash),
+ offsetof(GG110LoginOK, dummyhash),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -727,10 +814,10 @@ static const ProtobufCFieldDescriptor gg110_login_ok__field_descriptors[4] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110LoginOK, uin),
+ offsetof(GG110LoginOK, uin),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -739,10 +826,10 @@ static const ProtobufCFieldDescriptor gg110_login_ok__field_descriptors[4] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110LoginOK, server_time),
+ offsetof(GG110LoginOK, server_time),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -759,7 +846,7 @@ static const ProtobufCIntRange gg110_login_ok__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_login_ok__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110LoginOK",
"GG110LoginOK",
"GG110LoginOK",
@@ -772,41 +859,81 @@ const ProtobufCMessageDescriptor gg110_login_ok__descriptor =
(ProtobufCMessageInit) gg110_login_ok__init,
NULL,NULL,NULL /* reserved[123] */
};
-const ProtobufCEnumValue gg110_ack__type__enum_values_by_number[5] =
+static const ProtobufCFieldDescriptor gg110_pong__field_descriptors[1] =
+{
+ {
+ "server_time",
+ 1,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_FIXED32,
+ 0, /* quantifier_offset */
+ offsetof(GG110Pong, server_time),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+};
+static const unsigned gg110_pong__field_indices_by_name[] = {
+ 0, /* field[0] = server_time */
+};
+static const ProtobufCIntRange gg110_pong__number_ranges[1 + 1] =
+{
+ { 1, 0 },
+ { 0, 1 }
+};
+const ProtobufCMessageDescriptor gg110_pong__descriptor =
+{
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "GG110Pong",
+ "GG110Pong",
+ "GG110Pong",
+ "",
+ sizeof(GG110Pong),
+ 1,
+ gg110_pong__field_descriptors,
+ gg110_pong__field_indices_by_name,
+ 1, gg110_pong__number_ranges,
+ (ProtobufCMessageInit) gg110_pong__init,
+ NULL,NULL,NULL /* reserved[123] */
+};
+const ProtobufCEnumValue gg110_ack__type__enum_values_by_number[6] =
{
{ "MSG", "GG110_ACK__TYPE__MSG", 1 },
{ "CHAT", "GG110_ACK__TYPE__CHAT", 2 },
{ "CHAT_INFO", "GG110_ACK__TYPE__CHAT_INFO", 3 },
+ { "MAGIC_NOTIFICATION", "GG110_ACK__TYPE__MAGIC_NOTIFICATION", 5 },
{ "MPA", "GG110_ACK__TYPE__MPA", 6 },
{ "TRANSFER_INFO", "GG110_ACK__TYPE__TRANSFER_INFO", 7 },
};
static const ProtobufCIntRange gg110_ack__type__value_ranges[] = {
-{1, 0},{6, 3},{0, 5}
+{1, 0},{5, 3},{0, 6}
};
-const ProtobufCEnumValueIndex gg110_ack__type__enum_values_by_name[5] =
+const ProtobufCEnumValueIndex gg110_ack__type__enum_values_by_name[6] =
{
{ "CHAT", 1 },
{ "CHAT_INFO", 2 },
- { "MPA", 3 },
+ { "MAGIC_NOTIFICATION", 3 },
+ { "MPA", 4 },
{ "MSG", 0 },
- { "TRANSFER_INFO", 4 },
+ { "TRANSFER_INFO", 5 },
};
const ProtobufCEnumDescriptor gg110_ack__type__descriptor =
{
- PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
"GG110Ack.Type",
"Type",
"GG110Ack__Type",
"",
- 5,
+ 6,
gg110_ack__type__enum_values_by_number,
- 5,
+ 6,
gg110_ack__type__enum_values_by_name,
2,
gg110_ack__type__value_ranges,
NULL,NULL,NULL,NULL /* reserved[1234] */
};
-static const uint32_t gg110_ack__dummy1__default_value = 1;
+static const uint32_t gg110_ack__dummy1__default_value = 1u;
static const ProtobufCFieldDescriptor gg110_ack__field_descriptors[3] =
{
{
@@ -815,10 +942,10 @@ static const ProtobufCFieldDescriptor gg110_ack__field_descriptors[3] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_ENUM,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Ack, type),
+ offsetof(GG110Ack, type),
&gg110_ack__type__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -827,10 +954,10 @@ static const ProtobufCFieldDescriptor gg110_ack__field_descriptors[3] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Ack, seq),
+ offsetof(GG110Ack, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -839,10 +966,10 @@ static const ProtobufCFieldDescriptor gg110_ack__field_descriptors[3] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Ack, dummy1),
+ offsetof(GG110Ack, dummy1),
NULL,
&gg110_ack__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -858,7 +985,7 @@ static const ProtobufCIntRange gg110_ack__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_ack__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110Ack",
"GG110Ack",
"GG110Ack",
@@ -872,15 +999,15 @@ const ProtobufCMessageDescriptor gg110_ack__descriptor =
NULL,NULL,NULL /* reserved[123] */
};
char gg105_login__initial_descr__default_value[] = "";
-static const uint32_t gg105_login__initial_status__default_value = 8227;
+static const uint32_t gg105_login__initial_status__default_value = 8227u;
static const int32_t gg105_login__dummy1__default_value = 4;
-static const uint32_t gg105_login__dummy2__default_value = 65994615;
-static const uint32_t gg105_login__dummy3__default_value = 198164;
+static const uint32_t gg105_login__dummy2__default_value = 65994615u;
+static const uint32_t gg105_login__dummy3__default_value = 198164u;
static const int32_t gg105_login__dummy5__default_value = 255;
static const int32_t gg105_login__dummy6__default_value = 100;
-static const uint32_t gg105_login__dummy7__default_value = 127;
+static const uint32_t gg105_login__dummy7__default_value = 127u;
static const int32_t gg105_login__dummy8__default_value = 0;
-static const uint32_t gg105_login__dummy10__default_value = 0;
+static const uint32_t gg105_login__dummy10__default_value = 0u;
static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
{
{
@@ -889,10 +1016,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, lang),
+ offsetof(GG105Login, lang),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -901,10 +1028,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, uin),
+ offsetof(GG105Login, uin),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -913,10 +1040,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, hash),
+ offsetof(GG105Login, hash),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -925,10 +1052,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy1),
+ offsetof(GG105Login, dummy1),
NULL,
&gg105_login__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -937,10 +1064,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy2),
+ offsetof(GG105Login, dummy2),
NULL,
&gg105_login__dummy2__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -949,10 +1076,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy3),
+ offsetof(GG105Login, dummy3),
NULL,
&gg105_login__dummy3__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -961,10 +1088,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, client),
+ offsetof(GG105Login, client),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -973,10 +1100,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, initial_status),
+ offsetof(GG105Login, initial_status),
NULL,
&gg105_login__initial_status__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -985,10 +1112,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, initial_descr),
+ offsetof(GG105Login, initial_descr),
NULL,
&gg105_login__initial_descr__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -997,10 +1124,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy4),
+ offsetof(GG105Login, dummy4),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1009,10 +1136,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, supported_features),
+ offsetof(GG105Login, supported_features),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1021,10 +1148,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy5),
+ offsetof(GG105Login, dummy5),
NULL,
&gg105_login__dummy5__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1033,10 +1160,10 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_INT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG105Login, dummy6),
+ offsetof(GG105Login, dummy6),
NULL,
&gg105_login__dummy6__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1044,11 +1171,11 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
14,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED32,
- PROTOBUF_C_OFFSETOF(GG105Login, has_dummy7),
- PROTOBUF_C_OFFSETOF(GG105Login, dummy7),
+ offsetof(GG105Login, has_dummy7),
+ offsetof(GG105Login, dummy7),
NULL,
&gg105_login__dummy7__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1056,11 +1183,11 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
15,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_INT32,
- PROTOBUF_C_OFFSETOF(GG105Login, has_dummy8),
- PROTOBUF_C_OFFSETOF(GG105Login, dummy8),
+ offsetof(GG105Login, has_dummy8),
+ offsetof(GG105Login, dummy8),
NULL,
&gg105_login__dummy8__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1068,11 +1195,11 @@ static const ProtobufCFieldDescriptor gg105_login__field_descriptors[16] =
17,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_UINT32,
- PROTOBUF_C_OFFSETOF(GG105Login, has_dummy10),
- PROTOBUF_C_OFFSETOF(GG105Login, dummy10),
+ offsetof(GG105Login, has_dummy10),
+ offsetof(GG105Login, dummy10),
NULL,
&gg105_login__dummy10__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1102,7 +1229,7 @@ static const ProtobufCIntRange gg105_login__number_ranges[2 + 1] =
};
const ProtobufCMessageDescriptor gg105_login__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG105Login",
"GG105Login",
"GG105Login",
@@ -1123,10 +1250,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack_link__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAckLink, id),
+ offsetof(GG110MessageAckLink, id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1135,10 +1262,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack_link__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAckLink, url),
+ offsetof(GG110MessageAckLink, url),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1153,7 +1280,7 @@ static const ProtobufCIntRange gg110_message_ack_link__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_message_ack_link__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110MessageAckLink",
"GG110MessageAckLink",
"GG110MessageAckLink",
@@ -1166,7 +1293,7 @@ const ProtobufCMessageDescriptor gg110_message_ack_link__descriptor =
(ProtobufCMessageInit) gg110_message_ack_link__init,
NULL,NULL,NULL /* reserved[123] */
};
-static const uint32_t gg110_message_ack__dummy1__default_value = 0;
+static const uint32_t gg110_message_ack__dummy1__default_value = 0u;
static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
{
{
@@ -1175,10 +1302,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAck, msg_type),
+ offsetof(GG110MessageAck, msg_type),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1187,10 +1314,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAck, seq),
+ offsetof(GG110MessageAck, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1199,10 +1326,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAck, time),
+ offsetof(GG110MessageAck, time),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1210,11 +1337,11 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
4,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110MessageAck, has_msg_id),
- PROTOBUF_C_OFFSETOF(GG110MessageAck, msg_id),
+ offsetof(GG110MessageAck, has_msg_id),
+ offsetof(GG110MessageAck, msg_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1222,11 +1349,11 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
5,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110MessageAck, has_conv_id),
- PROTOBUF_C_OFFSETOF(GG110MessageAck, conv_id),
+ offsetof(GG110MessageAck, has_conv_id),
+ offsetof(GG110MessageAck, conv_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1234,11 +1361,11 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
6,
PROTOBUF_C_LABEL_REPEATED,
PROTOBUF_C_TYPE_MESSAGE,
- PROTOBUF_C_OFFSETOF(GG110MessageAck, n_links),
- PROTOBUF_C_OFFSETOF(GG110MessageAck, links),
+ offsetof(GG110MessageAck, n_links),
+ offsetof(GG110MessageAck, links),
&gg110_message_ack_link__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1247,10 +1374,10 @@ static const ProtobufCFieldDescriptor gg110_message_ack__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110MessageAck, dummy1),
+ offsetof(GG110MessageAck, dummy1),
NULL,
&gg110_message_ack__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1270,7 +1397,7 @@ static const ProtobufCIntRange gg110_message_ack__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_message_ack__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110MessageAck",
"GG110MessageAck",
"GG110MessageAck",
@@ -1298,7 +1425,7 @@ const ProtobufCEnumValueIndex gg110_event__type__enum_values_by_name[2] =
};
const ProtobufCEnumDescriptor gg110_event__type__descriptor =
{
- PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
"GG110Event.Type",
"Type",
"GG110Event__Type",
@@ -1319,10 +1446,10 @@ static const ProtobufCFieldDescriptor gg110_event__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_ENUM,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Event, type),
+ offsetof(GG110Event, type),
&gg110_event__type__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1331,10 +1458,10 @@ static const ProtobufCFieldDescriptor gg110_event__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Event, seq),
+ offsetof(GG110Event, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1343,10 +1470,10 @@ static const ProtobufCFieldDescriptor gg110_event__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Event, data),
+ offsetof(GG110Event, data),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1355,10 +1482,10 @@ static const ProtobufCFieldDescriptor gg110_event__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Event, subtype),
+ offsetof(GG110Event, subtype),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1366,11 +1493,11 @@ static const ProtobufCFieldDescriptor gg110_event__field_descriptors[5] =
5,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_UINT64,
- PROTOBUF_C_OFFSETOF(GG110Event, has_id),
- PROTOBUF_C_OFFSETOF(GG110Event, id),
+ offsetof(GG110Event, has_id),
+ offsetof(GG110Event, id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1388,7 +1515,7 @@ static const ProtobufCIntRange gg110_event__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_event__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110Event",
"GG110Event",
"GG110Event",
@@ -1409,11 +1536,11 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
1,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_BYTES,
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, has_sender),
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, sender),
+ offsetof(GG110RecvMessage, has_sender),
+ offsetof(GG110RecvMessage, sender),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1422,10 +1549,10 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, flags),
+ offsetof(GG110RecvMessage, flags),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1434,10 +1561,10 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, seq),
+ offsetof(GG110RecvMessage, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1446,10 +1573,10 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, time),
+ offsetof(GG110RecvMessage, time),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1458,10 +1585,10 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, msg_plain),
+ offsetof(GG110RecvMessage, msg_plain),
NULL,
&gg110_recv_message__msg_plain__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1470,10 +1597,10 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, msg_xhtml),
+ offsetof(GG110RecvMessage, msg_xhtml),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1481,11 +1608,11 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
7,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_BYTES,
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, has_data),
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, data),
+ offsetof(GG110RecvMessage, has_data),
+ offsetof(GG110RecvMessage, data),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1493,11 +1620,11 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
9,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, has_msg_id),
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, msg_id),
+ offsetof(GG110RecvMessage, has_msg_id),
+ offsetof(GG110RecvMessage, msg_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1505,11 +1632,11 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
10,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, has_chat_id),
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, chat_id),
+ offsetof(GG110RecvMessage, has_chat_id),
+ offsetof(GG110RecvMessage, chat_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1517,11 +1644,11 @@ static const ProtobufCFieldDescriptor gg110_recv_message__field_descriptors[10]
11,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, has_conv_id),
- PROTOBUF_C_OFFSETOF(GG110RecvMessage, conv_id),
+ offsetof(GG110RecvMessage, has_conv_id),
+ offsetof(GG110RecvMessage, conv_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1545,7 +1672,7 @@ static const ProtobufCIntRange gg110_recv_message__number_ranges[2 + 1] =
};
const ProtobufCMessageDescriptor gg110_recv_message__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110RecvMessage",
"GG110RecvMessage",
"GG110RecvMessage",
@@ -1559,7 +1686,7 @@ const ProtobufCMessageDescriptor gg110_recv_message__descriptor =
NULL,NULL,NULL /* reserved[123] */
};
char gg110_send_message__dummy3__default_value[] = "";
-static const uint32_t gg110_send_message__dummy1__default_value = 8;
+static const uint32_t gg110_send_message__dummy1__default_value = 8u;
static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
{
{
@@ -1567,11 +1694,11 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
1,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_BYTES,
- PROTOBUF_C_OFFSETOF(GG110SendMessage, has_recipient),
- PROTOBUF_C_OFFSETOF(GG110SendMessage, recipient),
+ offsetof(GG110SendMessage, has_recipient),
+ offsetof(GG110SendMessage, recipient),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1580,10 +1707,10 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110SendMessage, dummy1),
+ offsetof(GG110SendMessage, dummy1),
NULL,
&gg110_send_message__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1592,10 +1719,10 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110SendMessage, seq),
+ offsetof(GG110SendMessage, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1604,10 +1731,10 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110SendMessage, msg_plain),
+ offsetof(GG110SendMessage, msg_plain),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1616,10 +1743,10 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110SendMessage, msg_xhtml),
+ offsetof(GG110SendMessage, msg_xhtml),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1628,10 +1755,10 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110SendMessage, dummy3),
+ offsetof(GG110SendMessage, dummy3),
NULL,
&gg110_send_message__dummy3__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1639,11 +1766,11 @@ static const ProtobufCFieldDescriptor gg110_send_message__field_descriptors[7] =
10,
PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_OFFSETOF(GG110SendMessage, has_chat_id),
- PROTOBUF_C_OFFSETOF(GG110SendMessage, chat_id),
+ offsetof(GG110SendMessage, has_chat_id),
+ offsetof(GG110SendMessage, chat_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1665,7 +1792,7 @@ static const ProtobufCIntRange gg110_send_message__number_ranges[3 + 1] =
};
const ProtobufCMessageDescriptor gg110_send_message__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110SendMessage",
"GG110SendMessage",
"GG110SendMessage",
@@ -1686,10 +1813,10 @@ static const ProtobufCFieldDescriptor gg110_imtoken__field_descriptors[1] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Imtoken, imtoken),
+ offsetof(GG110Imtoken, imtoken),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1703,7 +1830,7 @@ static const ProtobufCIntRange gg110_imtoken__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_imtoken__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110Imtoken",
"GG110Imtoken",
"GG110Imtoken",
@@ -1724,10 +1851,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, participant),
+ offsetof(GG110ChatInfoUpdate, participant),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1736,10 +1863,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, inviter),
+ offsetof(GG110ChatInfoUpdate, inviter),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1748,10 +1875,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, update_type),
+ offsetof(GG110ChatInfoUpdate, update_type),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1760,10 +1887,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, time),
+ offsetof(GG110ChatInfoUpdate, time),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1772,10 +1899,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, dummy1),
+ offsetof(GG110ChatInfoUpdate, dummy1),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1784,10 +1911,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, version),
+ offsetof(GG110ChatInfoUpdate, version),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1796,10 +1923,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, dummy2),
+ offsetof(GG110ChatInfoUpdate, dummy2),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1808,10 +1935,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, msg_id),
+ offsetof(GG110ChatInfoUpdate, msg_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1820,10 +1947,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, chat_id),
+ offsetof(GG110ChatInfoUpdate, chat_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1832,10 +1959,10 @@ static const ProtobufCFieldDescriptor gg110_chat_info_update__field_descriptors[
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110ChatInfoUpdate, conv_id),
+ offsetof(GG110ChatInfoUpdate, conv_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1859,7 +1986,7 @@ static const ProtobufCIntRange gg110_chat_info_update__number_ranges[2 + 1] =
};
const ProtobufCMessageDescriptor gg110_chat_info_update__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110ChatInfoUpdate",
"GG110ChatInfoUpdate",
"GG110ChatInfoUpdate",
@@ -1880,10 +2007,10 @@ static const ProtobufCFieldDescriptor protobuf_kvp__field_descriptors[2] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(ProtobufKVP, key),
+ offsetof(ProtobufKVP, key),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1892,10 +2019,10 @@ static const ProtobufCFieldDescriptor protobuf_kvp__field_descriptors[2] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(ProtobufKVP, value),
+ offsetof(ProtobufKVP, value),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1910,7 +2037,7 @@ static const ProtobufCIntRange protobuf_kvp__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor protobuf_kvp__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"ProtobufKVP",
"ProtobufKVP",
"ProtobufKVP",
@@ -1923,7 +2050,7 @@ const ProtobufCMessageDescriptor protobuf_kvp__descriptor =
(ProtobufCMessageInit) protobuf_kvp__init,
NULL,NULL,NULL /* reserved[123] */
};
-static const uint32_t gg110_options__dummy1__default_value = 0;
+static const uint32_t gg110_options__dummy1__default_value = 0u;
static const ProtobufCFieldDescriptor gg110_options__field_descriptors[2] =
{
{
@@ -1931,11 +2058,11 @@ static const ProtobufCFieldDescriptor gg110_options__field_descriptors[2] =
1,
PROTOBUF_C_LABEL_REPEATED,
PROTOBUF_C_TYPE_MESSAGE,
- PROTOBUF_C_OFFSETOF(GG110Options, n_options),
- PROTOBUF_C_OFFSETOF(GG110Options, options),
+ offsetof(GG110Options, n_options),
+ offsetof(GG110Options, options),
&protobuf_kvp__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1944,10 +2071,10 @@ static const ProtobufCFieldDescriptor gg110_options__field_descriptors[2] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110Options, dummy1),
+ offsetof(GG110Options, dummy1),
NULL,
&gg110_options__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -1962,7 +2089,7 @@ static const ProtobufCIntRange gg110_options__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_options__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110Options",
"GG110Options",
"GG110Options",
@@ -1975,7 +2102,7 @@ const ProtobufCMessageDescriptor gg110_options__descriptor =
(ProtobufCMessageInit) gg110_options__init,
NULL,NULL,NULL /* reserved[123] */
};
-static const uint32_t gg110_access_info__dummy1__default_value = 1;
+static const uint32_t gg110_access_info__dummy1__default_value = 1u;
static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
{
{
@@ -1984,10 +2111,10 @@ static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110AccessInfo, dummy1),
+ offsetof(GG110AccessInfo, dummy1),
NULL,
&gg110_access_info__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -1996,10 +2123,10 @@ static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110AccessInfo, dummy2),
+ offsetof(GG110AccessInfo, dummy2),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2008,10 +2135,10 @@ static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110AccessInfo, last_message),
+ offsetof(GG110AccessInfo, last_message),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2020,10 +2147,10 @@ static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110AccessInfo, last_file_transfer),
+ offsetof(GG110AccessInfo, last_file_transfer),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2032,10 +2159,10 @@ static const ProtobufCFieldDescriptor gg110_access_info__field_descriptors[5] =
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG110AccessInfo, last_conference_ch),
+ offsetof(GG110AccessInfo, last_conference_ch),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -2053,7 +2180,7 @@ static const ProtobufCIntRange gg110_access_info__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg110_access_info__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG110AccessInfo",
"GG110AccessInfo",
"GG110AccessInfo",
@@ -2066,7 +2193,7 @@ const ProtobufCMessageDescriptor gg110_access_info__descriptor =
(ProtobufCMessageInit) gg110_access_info__init,
NULL,NULL,NULL /* reserved[123] */
};
-static const uint32_t gg112_transfer_info_uin__dummy1__default_value = 1;
+static const uint32_t gg112_transfer_info_uin__dummy1__default_value = 1u;
static const ProtobufCFieldDescriptor gg112_transfer_info_uin__field_descriptors[2] =
{
{
@@ -2075,10 +2202,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_uin__field_descriptors
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoUin, dummy1),
+ offsetof(GG112TransferInfoUin, dummy1),
NULL,
&gg112_transfer_info_uin__dummy1__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2087,10 +2214,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_uin__field_descriptors
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_BYTES,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoUin, uin),
+ offsetof(GG112TransferInfoUin, uin),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -2105,7 +2232,7 @@ static const ProtobufCIntRange gg112_transfer_info_uin__number_ranges[1 + 1] =
};
const ProtobufCMessageDescriptor gg112_transfer_info_uin__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG112TransferInfoUin",
"GG112TransferInfoUin",
"GG112TransferInfoUin",
@@ -2127,10 +2254,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, type),
+ offsetof(GG112TransferInfoFile, type),
NULL,
&gg112_transfer_info_file__type__default_value,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2139,10 +2266,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, url),
+ offsetof(GG112TransferInfoFile, url),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2151,10 +2278,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, content_type),
+ offsetof(GG112TransferInfoFile, content_type),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2163,10 +2290,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_STRING,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, filename),
+ offsetof(GG112TransferInfoFile, filename),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2175,10 +2302,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, filesize),
+ offsetof(GG112TransferInfoFile, filesize),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2187,10 +2314,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info_file__field_descriptor
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfoFile, msg_id),
+ offsetof(GG112TransferInfoFile, msg_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -2211,7 +2338,7 @@ static const ProtobufCIntRange gg112_transfer_info_file__number_ranges[3 + 1] =
};
const ProtobufCMessageDescriptor gg112_transfer_info_file__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG112TransferInfoFile",
"GG112TransferInfoFile",
"GG112TransferInfoFile",
@@ -2224,7 +2351,6 @@ const ProtobufCMessageDescriptor gg112_transfer_info_file__descriptor =
(ProtobufCMessageInit) gg112_transfer_info_file__init,
NULL,NULL,NULL /* reserved[123] */
};
-static const uint32_t gg112_transfer_info__dummy1__default_value = 6;
static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9] =
{
{
@@ -2233,10 +2359,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, dummy1),
+ offsetof(GG112TransferInfo, dummy1),
NULL,
- &gg112_transfer_info__dummy1__default_value,
- 0, /* packed */
+ NULL,
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2245,10 +2371,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, peer),
+ offsetof(GG112TransferInfo, peer),
&gg112_transfer_info_uin__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2257,10 +2383,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, time),
+ offsetof(GG112TransferInfo, time),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2269,10 +2395,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, sender),
+ offsetof(GG112TransferInfo, sender),
&gg112_transfer_info_uin__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2280,23 +2406,23 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
5,
PROTOBUF_C_LABEL_REPEATED,
PROTOBUF_C_TYPE_MESSAGE,
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, n_data),
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, data),
+ offsetof(GG112TransferInfo, n_data),
+ offsetof(GG112TransferInfo, data),
&protobuf_kvp__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
"file",
6,
- PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_LABEL_OPTIONAL,
PROTOBUF_C_TYPE_MESSAGE,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, file),
+ offsetof(GG112TransferInfo, file),
&gg112_transfer_info_file__descriptor,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2305,10 +2431,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_UINT32,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, seq),
+ offsetof(GG112TransferInfo, seq),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2317,10 +2443,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, msg_id),
+ offsetof(GG112TransferInfo, msg_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
{
@@ -2329,10 +2455,10 @@ static const ProtobufCFieldDescriptor gg112_transfer_info__field_descriptors[9]
PROTOBUF_C_LABEL_REQUIRED,
PROTOBUF_C_TYPE_FIXED64,
0, /* quantifier_offset */
- PROTOBUF_C_OFFSETOF(GG112TransferInfo, conv_id),
+ offsetof(GG112TransferInfo, conv_id),
NULL,
NULL,
- 0, /* packed */
+ 0, /* flags */
0,NULL,NULL /* reserved1,reserved2, etc */
},
};
@@ -2355,7 +2481,7 @@ static const ProtobufCIntRange gg112_transfer_info__number_ranges[2 + 1] =
};
const ProtobufCMessageDescriptor gg112_transfer_info__descriptor =
{
- PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC,
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
"GG112TransferInfo",
"GG112TransferInfo",
"GG112TransferInfo",
@@ -2368,3 +2494,110 @@ const ProtobufCMessageDescriptor gg112_transfer_info__descriptor =
(ProtobufCMessageInit) gg112_transfer_info__init,
NULL,NULL,NULL /* reserved[123] */
};
+char gg110_magic_notification__dummy4__default_value[] = "";
+static const int32_t gg110_magic_notification__dummy1__default_value = 2;
+static const int32_t gg110_magic_notification__dummy2__default_value = 1;
+static const int32_t gg110_magic_notification__dummy3__default_value = 1;
+static const ProtobufCFieldDescriptor gg110_magic_notification__field_descriptors[6] =
+{
+ {
+ "dummy1",
+ 1,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_INT32,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, dummy1),
+ NULL,
+ &gg110_magic_notification__dummy1__default_value,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "seq",
+ 2,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_INT32,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, seq),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "dummy2",
+ 3,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_INT32,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, dummy2),
+ NULL,
+ &gg110_magic_notification__dummy2__default_value,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "dummy3",
+ 4,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_INT32,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, dummy3),
+ NULL,
+ &gg110_magic_notification__dummy3__default_value,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "uin",
+ 5,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_BYTES,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, uin),
+ NULL,
+ NULL,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+ {
+ "dummy4",
+ 6,
+ PROTOBUF_C_LABEL_REQUIRED,
+ PROTOBUF_C_TYPE_STRING,
+ 0, /* quantifier_offset */
+ offsetof(GG110MagicNotification, dummy4),
+ NULL,
+ &gg110_magic_notification__dummy4__default_value,
+ 0, /* flags */
+ 0,NULL,NULL /* reserved1,reserved2, etc */
+ },
+};
+static const unsigned gg110_magic_notification__field_indices_by_name[] = {
+ 0, /* field[0] = dummy1 */
+ 2, /* field[2] = dummy2 */
+ 3, /* field[3] = dummy3 */
+ 5, /* field[5] = dummy4 */
+ 1, /* field[1] = seq */
+ 4, /* field[4] = uin */
+};
+static const ProtobufCIntRange gg110_magic_notification__number_ranges[1 + 1] =
+{
+ { 1, 0 },
+ { 0, 6 }
+};
+const ProtobufCMessageDescriptor gg110_magic_notification__descriptor =
+{
+ PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+ "GG110MagicNotification",
+ "GG110MagicNotification",
+ "GG110MagicNotification",
+ "",
+ sizeof(GG110MagicNotification),
+ 6,
+ gg110_magic_notification__field_descriptors,
+ gg110_magic_notification__field_indices_by_name,
+ 1, gg110_magic_notification__number_ranges,
+ (ProtobufCMessageInit) gg110_magic_notification__init,
+ NULL,NULL,NULL /* reserved[123] */
+};
diff --git a/libpurple/protocols/gg/lib/packets.pb-c.h b/libpurple/protocols/gg/lib/packets.pb-c.h
index 97e55e0ac0..2d760935f0 100644
--- a/libpurple/protocols/gg/lib/packets.pb-c.h
+++ b/libpurple/protocols/gg/lib/packets.pb-c.h
@@ -1,14 +1,22 @@
/* Generated by the protocol buffer compiler. DO NOT EDIT! */
+/* Generated from: packets.proto */
#ifndef PROTOBUF_C_packets_2eproto__INCLUDED
#define PROTOBUF_C_packets_2eproto__INCLUDED
#include "protobuf.h"
-PROTOBUF_C_BEGIN_DECLS
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1000000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1000002 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
typedef struct _GG110LoginOK GG110LoginOK;
+typedef struct _GG110Pong GG110Pong;
typedef struct _GG110Ack GG110Ack;
typedef struct _GG105Login GG105Login;
typedef struct _GG110MessageAckLink GG110MessageAckLink;
@@ -24,6 +32,7 @@ typedef struct _GG110AccessInfo GG110AccessInfo;
typedef struct _GG112TransferInfoUin GG112TransferInfoUin;
typedef struct _GG112TransferInfoFile GG112TransferInfoFile;
typedef struct _GG112TransferInfo GG112TransferInfo;
+typedef struct _GG110MagicNotification GG110MagicNotification;
/* --- enums --- */
@@ -32,12 +41,15 @@ typedef enum _GG110Ack__Type {
GG110_ACK__TYPE__MSG = 1,
GG110_ACK__TYPE__CHAT = 2,
GG110_ACK__TYPE__CHAT_INFO = 3,
+ GG110_ACK__TYPE__MAGIC_NOTIFICATION = 5,
GG110_ACK__TYPE__MPA = 6,
GG110_ACK__TYPE__TRANSFER_INFO = 7
+ PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(GG110_ACK__TYPE)
} GG110Ack__Type;
typedef enum _GG110Event__Type {
GG110_EVENT__TYPE__XML = 0,
GG110_EVENT__TYPE__JSON = 2
+ PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(GG110_EVENT__TYPE)
} GG110Event__Type;
/* --- messages --- */
@@ -55,6 +67,16 @@ struct _GG110LoginOK
, 1, NULL, 0, 0 }
+struct _GG110Pong
+{
+ ProtobufCMessage base;
+ uint32_t server_time;
+};
+#define GG110_PONG__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&gg110_pong__descriptor) \
+ , 0 }
+
+
struct _GG110Ack
{
ProtobufCMessage base;
@@ -64,7 +86,7 @@ struct _GG110Ack
};
#define GG110_ACK__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg110_ack__descriptor) \
- , 0, 0, 1 }
+ , 0, 0, 1u }
struct _GG105Login
@@ -93,7 +115,7 @@ struct _GG105Login
extern char gg105_login__initial_descr__default_value[];
#define GG105_LOGIN__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg105_login__descriptor) \
- , NULL, {0,NULL}, {0,NULL}, NULL, 8227, gg105_login__initial_descr__default_value, NULL, 4, 65994615, 198164, {0,NULL}, 255, 100, 0,127, 0,0, 0,0 }
+ , NULL, {0,NULL}, {0,NULL}, NULL, 8227u, gg105_login__initial_descr__default_value, NULL, 4, 65994615u, 198164u, {0,NULL}, 255, 100, 0,127u, 0,0, 0,0u }
struct _GG110MessageAckLink
@@ -123,7 +145,7 @@ struct _GG110MessageAck
};
#define GG110_MESSAGE_ACK__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg110_message_ack__descriptor) \
- , 0, 0, 0, 0,0, 0,0, 0,NULL, 0 }
+ , 0, 0, 0, 0,0, 0,0, 0,NULL, 0u }
struct _GG110Event
@@ -182,7 +204,7 @@ struct _GG110SendMessage
extern char gg110_send_message__dummy3__default_value[];
#define GG110_SEND_MESSAGE__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg110_send_message__descriptor) \
- , 0,{0,NULL}, 8, 0, NULL, NULL, gg110_send_message__dummy3__default_value, 0,0 }
+ , 0,{0,NULL}, 8u, 0, NULL, NULL, gg110_send_message__dummy3__default_value, 0,0 }
struct _GG110Imtoken
@@ -234,7 +256,7 @@ struct _GG110Options
};
#define GG110_OPTIONS__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg110_options__descriptor) \
- , 0,NULL, 0 }
+ , 0,NULL, 0u }
struct _GG110AccessInfo
@@ -248,7 +270,7 @@ struct _GG110AccessInfo
};
#define GG110_ACCESS_INFO__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg110_access_info__descriptor) \
- , 1, 0, 0, 0, 0 }
+ , 1u, 0, 0, 0, 0 }
struct _GG112TransferInfoUin
@@ -259,7 +281,7 @@ struct _GG112TransferInfoUin
};
#define GG112_TRANSFER_INFO_UIN__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg112_transfer_info_uin__descriptor) \
- , 1, {0,NULL} }
+ , 1u, {0,NULL} }
struct _GG112TransferInfoFile
@@ -294,7 +316,23 @@ struct _GG112TransferInfo
};
#define GG112_TRANSFER_INFO__INIT \
{ PROTOBUF_C_MESSAGE_INIT (&gg112_transfer_info__descriptor) \
- , 6, NULL, NULL, 0, 0,NULL, NULL, 0, 0, 0 }
+ , 0, NULL, NULL, 0, 0,NULL, NULL, 0, 0, 0 }
+
+
+struct _GG110MagicNotification
+{
+ ProtobufCMessage base;
+ int32_t dummy1;
+ int32_t seq;
+ int32_t dummy2;
+ int32_t dummy3;
+ ProtobufCBinaryData uin;
+ char *dummy4;
+};
+extern char gg110_magic_notification__dummy4__default_value[];
+#define GG110_MAGIC_NOTIFICATION__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&gg110_magic_notification__descriptor) \
+ , 2, 0, 1, 1, {0,NULL}, gg110_magic_notification__dummy4__default_value }
/* GG110LoginOK methods */
@@ -316,6 +354,25 @@ GG110LoginOK *
void gg110_login_ok__free_unpacked
(GG110LoginOK *message,
ProtobufCAllocator *allocator);
+/* GG110Pong methods */
+void gg110_pong__init
+ (GG110Pong *message);
+size_t gg110_pong__get_packed_size
+ (const GG110Pong *message);
+size_t gg110_pong__pack
+ (const GG110Pong *message,
+ uint8_t *out);
+size_t gg110_pong__pack_to_buffer
+ (const GG110Pong *message,
+ ProtobufCBuffer *buffer);
+GG110Pong *
+ gg110_pong__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+void gg110_pong__free_unpacked
+ (GG110Pong *message,
+ ProtobufCAllocator *allocator);
/* GG110Ack methods */
void gg110_ack__init
(GG110Ack *message);
@@ -601,11 +658,33 @@ GG112TransferInfo *
void gg112_transfer_info__free_unpacked
(GG112TransferInfo *message,
ProtobufCAllocator *allocator);
+/* GG110MagicNotification methods */
+void gg110_magic_notification__init
+ (GG110MagicNotification *message);
+size_t gg110_magic_notification__get_packed_size
+ (const GG110MagicNotification *message);
+size_t gg110_magic_notification__pack
+ (const GG110MagicNotification *message,
+ uint8_t *out);
+size_t gg110_magic_notification__pack_to_buffer
+ (const GG110MagicNotification *message,
+ ProtobufCBuffer *buffer);
+GG110MagicNotification *
+ gg110_magic_notification__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+void gg110_magic_notification__free_unpacked
+ (GG110MagicNotification *message,
+ ProtobufCAllocator *allocator);
/* --- per-message closures --- */
typedef void (*GG110LoginOK_Closure)
(const GG110LoginOK *message,
void *closure_data);
+typedef void (*GG110Pong_Closure)
+ (const GG110Pong *message,
+ void *closure_data);
typedef void (*GG110Ack_Closure)
(const GG110Ack *message,
void *closure_data);
@@ -651,6 +730,9 @@ typedef void (*GG112TransferInfoFile_Closure)
typedef void (*GG112TransferInfo_Closure)
(const GG112TransferInfo *message,
void *closure_data);
+typedef void (*GG110MagicNotification_Closure)
+ (const GG110MagicNotification *message,
+ void *closure_data);
/* --- services --- */
@@ -658,6 +740,7 @@ typedef void (*GG112TransferInfo_Closure)
/* --- descriptors --- */
extern const ProtobufCMessageDescriptor gg110_login_ok__descriptor;
+extern const ProtobufCMessageDescriptor gg110_pong__descriptor;
extern const ProtobufCMessageDescriptor gg110_ack__descriptor;
extern const ProtobufCEnumDescriptor gg110_ack__type__descriptor;
extern const ProtobufCMessageDescriptor gg105_login__descriptor;
@@ -675,8 +758,9 @@ extern const ProtobufCMessageDescriptor gg110_access_info__descriptor;
extern const ProtobufCMessageDescriptor gg112_transfer_info_uin__descriptor;
extern const ProtobufCMessageDescriptor gg112_transfer_info_file__descriptor;
extern const ProtobufCMessageDescriptor gg112_transfer_info__descriptor;
+extern const ProtobufCMessageDescriptor gg110_magic_notification__descriptor;
-PROTOBUF_C_END_DECLS
+PROTOBUF_C__END_DECLS
-#endif /* PROTOBUF_packets_2eproto__INCLUDED */
+#endif /* PROTOBUF_C_packets_2eproto__INCLUDED */
diff --git a/libpurple/protocols/gg/lib/protobuf-c.c b/libpurple/protocols/gg/lib/protobuf-c.c
index e7a4c4c183..7b8d07bd44 100644
--- a/libpurple/protocols/gg/lib/protobuf-c.c
+++ b/libpurple/protocols/gg/lib/protobuf-c.c
@@ -1,2374 +1,2902 @@
-/* --- protobuf-c.c: public protobuf c runtime implementation --- */
-/* Source: http://code.google.com/p/protobuf-c/ r331 */
-
/*
- * Copyright (c) 2008-2011, Dave Benson.
- *
+ * Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
* All rights reserved.
- *
- * Redistribution and use in source and binary forms, with
- * or without modification, are permitted provided that the
- * following conditions are met:
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
-
- * Redistributions in binary form must reproduce
- * the above copyright notice, this list of conditions and
- * the following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * Neither the name
- * of "protobuf-c" nor the names of its contributors
- * may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+/*! \file
+ * Support library for `protoc-c` generated code.
+ *
+ * This file implements the public API used by the code generated
+ * by `protoc-c`.
+ *
+ * \authors Dave Benson and the protobuf-c authors
+ *
+ * \copyright 2008-2014. Licensed under the terms of the [BSD-2-Clause] license.
+ */
-/* TODO items:
+/**
+ * \todo 64-BIT OPTIMIZATION: certain implementations use 32-bit math
+ * even on 64-bit platforms (uint64_size, uint64_pack, parse_uint64).
+ *
+ * \todo Use size_t consistently.
+ */
- * 64-BIT OPTIMIZATION: certain implementations use 32-bit math even on 64-bit platforms
- (uint64_size, uint64_pack, parse_uint64)
+#include <stdlib.h> /* for malloc, free */
+#include <string.h> /* for strcmp, strlen, memcpy, memmove, memset */
- * get_packed_size and pack seem to use type-prefixed names,
- whereas parse uses type-suffixed names. pick one and stick with it.
- Decision: go with type-suffixed, since the type (or its instance)
- is typically the object of the verb.
- NOTE: perhaps the "parse" methods should be reanemd to "unpack"
- at the same time. (this only affects internal (static) functions)
+/* Pull WORDS_BIGENDIAN etc */
+#include "config.h"
- * use TRUE and FALSE instead of 1 and 0 as appropriate
+#include "protobuf-c.h"
- * use size_t consistently
- */
+#define TRUE 1
+#define FALSE 0
-#include "config.h"
-#define HAVE_PROTOBUF_C_CONFIG_H 0
-#ifdef GG_CONFIG_BIGENDIAN
-# define IS_LITTLE_ENDIAN 0
-#else
-# define IS_LITTLE_ENDIAN 1
-#endif
+#define PROTOBUF_C__ASSERT_NOT_REACHED() assert(0)
-#if HAVE_PROTOBUF_C_CONFIG_H
-#include "protobuf-c-config.h"
-#endif
-#include <stdio.h> /* for occasional printf()s */
-#include <stdlib.h> /* for abort(), malloc() etc */
-#include <string.h> /* for strlen(), memcpy(), memmove() */
-#if 0 /* we no longer use alloca. */
-#if HAVE_ALLOCA_H
-#include <alloca.h>
-#elif HAVE_MALLOC_H
-#include <malloc.h>
-#endif
+/* Workaround for Microsoft compilers. */
+#ifdef _MSC_VER
+# define inline __inline
#endif
+/**
+ * \defgroup internal Internal functions and macros
+ *
+ * These are not exported by the library but are useful to developers working
+ * on `libprotobuf-c` itself.
+ */
-#ifndef PRINT_UNPACK_ERRORS
-#define PRINT_UNPACK_ERRORS 1
-#endif
+/**
+ * \defgroup macros Utility macros for manipulating structures
+ *
+ * Macros and constants used to manipulate the base "classes" generated by
+ * `protobuf-c`. They also define limits and check correctness.
+ *
+ * \ingroup internal
+ * @{
+ */
-#include "protobuf-c.h"
-#include "internal.h"
-
-unsigned protobuf_c_major = PROTOBUF_C_MAJOR;
-unsigned protobuf_c_minor = PROTOBUF_C_MINOR;
-
-#define MAX_UINT64_ENCODED_SIZE 10
-
-/* This should be roughly the biggest message you think you'll encounter.
- However, the only point of the hashing is to detect uninitialized required members.
- I doubt many messages have 128 REQUIRED fields, so hopefully this'll be fine.
-
- TODO: A better solution is to separately in the descriptor index the required fields,
- and use the allcoator if the required field count is too big. */
-#define MAX_MEMBERS_FOR_HASH_SIZE 128
-
-/* convenience macros */
-#define TMPALLOC(allocator, size) ((allocator)->tmp_alloc ((allocator)->allocator_data, (size)))
-#define FREE(allocator, ptr) \
- do { if ((ptr) != NULL) ((allocator)->free ((allocator)->allocator_data, (ptr))); } while(0)
-#define UNALIGNED_ALLOC(allocator, size) ALLOC (allocator, size) /* placeholder */
-#define STRUCT_MEMBER_P(struct_p, struct_offset) \
- ((void *) ((uint8_t*) (struct_p) + (struct_offset)))
-#define STRUCT_MEMBER(member_type, struct_p, struct_offset) \
- (*(member_type*) STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-#define STRUCT_MEMBER_PTR(member_type, struct_p, struct_offset) \
- ((member_type*) STRUCT_MEMBER_P ((struct_p), (struct_offset)))
-#define TRUE 1
-#define FALSE 0
+/** The maximum length of a 64-bit integer in varint encoding. */
+#define MAX_UINT64_ENCODED_SIZE 10
-static void
-alloc_failed_warning (unsigned size, const char *filename, unsigned line)
-{
- fprintf (stderr,
- "WARNING: out-of-memory allocating a block of size %u (%s:%u)\n",
- size, filename, line);
-}
+#ifndef PROTOBUF_C_UNPACK_ERROR
+# define PROTOBUF_C_UNPACK_ERROR(...)
+#endif
-/* Try to allocate memory, running some special code if it fails. */
-#define DO_ALLOC(dst, allocator, size, fail_code) \
-{ size_t da__allocation_size = (size); \
- if (da__allocation_size == 0) \
- dst = NULL; \
- else if ((dst=((allocator)->alloc ((allocator)->allocator_data, \
- da__allocation_size))) == NULL) \
- { \
- alloc_failed_warning (da__allocation_size, __FILE__, __LINE__); \
- fail_code; \
- } \
-}
-#define DO_UNALIGNED_ALLOC DO_ALLOC /* placeholder */
+/**
+ * Internal `ProtobufCMessage` manipulation macro.
+ *
+ * Base macro for manipulating a `ProtobufCMessage`. Used by STRUCT_MEMBER() and
+ * STRUCT_MEMBER_PTR().
+ */
+#define STRUCT_MEMBER_P(struct_p, struct_offset) \
+ ((void *) ((uint8_t *) (struct_p) + (struct_offset)))
+/**
+ * Return field in a `ProtobufCMessage` based on offset.
+ *
+ * Take a pointer to a `ProtobufCMessage` and find the field at the offset.
+ * Cast it to the passed type.
+ */
+#define STRUCT_MEMBER(member_type, struct_p, struct_offset) \
+ (*(member_type *) STRUCT_MEMBER_P((struct_p), (struct_offset)))
+/**
+ * Return field in a `ProtobufCMessage` based on offset.
+ *
+ * Take a pointer to a `ProtobufCMessage` and find the field at the offset. Cast
+ * it to a pointer to the passed type.
+ */
+#define STRUCT_MEMBER_PTR(member_type, struct_p, struct_offset) \
+ ((member_type *) STRUCT_MEMBER_P((struct_p), (struct_offset)))
+
+/* Assertions for magic numbers. */
#define ASSERT_IS_ENUM_DESCRIPTOR(desc) \
- assert((desc)->magic == PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC)
+ assert((desc)->magic == PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC)
+
#define ASSERT_IS_MESSAGE_DESCRIPTOR(desc) \
- assert((desc)->magic == PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC)
+ assert((desc)->magic == PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC)
+
#define ASSERT_IS_MESSAGE(message) \
- ASSERT_IS_MESSAGE_DESCRIPTOR((message)->descriptor)
+ ASSERT_IS_MESSAGE_DESCRIPTOR((message)->descriptor)
+
#define ASSERT_IS_SERVICE_DESCRIPTOR(desc) \
- assert((desc)->magic == PROTOBUF_C_SERVICE_DESCRIPTOR_MAGIC)
+ assert((desc)->magic == PROTOBUF_C__SERVICE_DESCRIPTOR_MAGIC)
-/* --- allocator --- */
+/**@}*/
+
+/* --- version --- */
-static void protobuf_c_out_of_memory_default (void) GG_NORETURN;
-static void protobuf_c_out_of_memory_default (void)
+const char *
+protobuf_c_version(void)
{
- fprintf (stderr, "Out Of Memory!!!\n");
- abort ();
+ return PROTOBUF_C_VERSION;
}
-void (*protobuf_c_out_of_memory) (void) = protobuf_c_out_of_memory_default;
-static void *system_alloc(void *allocator_data, size_t size)
+uint32_t
+protobuf_c_version_number(void)
{
- void *rv;
- (void) allocator_data;
- if (size == 0)
- return NULL;
- rv = malloc (size);
- if (rv == NULL)
- protobuf_c_out_of_memory ();
- return rv;
+ return PROTOBUF_C_VERSION_NUMBER;
}
-static void system_free (void *allocator_data, void *data)
+/* --- allocator --- */
+
+static void *
+system_alloc(void *allocator_data, size_t size)
{
- (void) allocator_data;
- if (data)
- free (data);
+ return malloc(size);
}
-/* Some users may configure the default allocator;
- providing your own allocator to unpack() is prefered.
- this allocator is still used for packing nested messages. */
-ProtobufCAllocator protobuf_c_default_allocator =
+static void
+system_free(void *allocator_data, void *data)
{
- system_alloc,
- system_free,
- NULL, /* tmp_alloc */
- 8192, /* max_alloca */
- NULL /* allocator_data */
-};
+ free(data);
+}
-/* Users should NOT modify this structure,
- but it's difficult to prevent.
+static inline void *
+do_alloc(ProtobufCAllocator *allocator, size_t size)
+{
+ return allocator->alloc(allocator->allocator_data, size);
+}
- please modify protobuf_c_default_allocator instead. */
-ProtobufCAllocator protobuf_c_system_allocator =
+static inline void
+do_free(ProtobufCAllocator *allocator, void *data)
{
- system_alloc,
- system_free,
- NULL, /* tmp_alloc */
- 8192, /* max_alloca */
- NULL /* allocator_data */
-};
+ if (data != NULL)
+ allocator->free(allocator->allocator_data, data);
+}
+/*
+ * This allocator uses the system's malloc() and free(). It is the default
+ * allocator used if NULL is passed as the ProtobufCAllocator to an exported
+ * function.
+ */
+static ProtobufCAllocator protobuf_c__allocator = {
+ .alloc = &system_alloc,
+ .free = &system_free,
+ .allocator_data = NULL,
+};
/* === buffer-simple === */
+
void
-protobuf_c_buffer_simple_append (ProtobufCBuffer *buffer,
- size_t len,
- const uint8_t *data)
-{
- ProtobufCBufferSimple *simp = (ProtobufCBufferSimple *) buffer;
- size_t new_len = simp->len + len;
- if (new_len > simp->alloced)
- {
- size_t new_alloced = simp->alloced * 2;
- uint8_t *new_data;
- while (new_alloced < new_len)
- new_alloced += new_alloced;
- DO_ALLOC (new_data, &protobuf_c_default_allocator, new_alloced, return);
- if (!new_data)
- return;
- memcpy (new_data, simp->data, simp->len);
- if (simp->must_free_data)
- FREE (&protobuf_c_default_allocator, simp->data);
- else
- simp->must_free_data = 1;
- simp->data = new_data;
- simp->alloced = new_alloced;
- }
- memcpy (simp->data + simp->len, data, len);
- simp->len = new_len;
-}
-
-/* === get_packed_size() === */
-
-/* Return the number of bytes required to store the
- tag for the field (which includes 3 bits for
- the wire-type, and a single bit that denotes the end-of-tag. */
+protobuf_c_buffer_simple_append(ProtobufCBuffer *buffer,
+ size_t len, const uint8_t *data)
+{
+ ProtobufCBufferSimple *simp = (ProtobufCBufferSimple *) buffer;
+ size_t new_len = simp->len + len;
+
+ if (new_len > simp->alloced) {
+ ProtobufCAllocator *allocator = simp->allocator;
+ size_t new_alloced = simp->alloced * 2;
+ uint8_t *new_data;
+
+ if (allocator == NULL)
+ allocator = &protobuf_c__allocator;
+ while (new_alloced < new_len)
+ new_alloced += new_alloced;
+ new_data = do_alloc(allocator, new_alloced);
+ if (!new_data)
+ return;
+ memcpy(new_data, simp->data, simp->len);
+ if (simp->must_free_data)
+ do_free(allocator, simp->data);
+ else
+ simp->must_free_data = TRUE;
+ simp->data = new_data;
+ simp->alloced = new_alloced;
+ }
+ memcpy(simp->data + simp->len, data, len);
+ simp->len = new_len;
+}
+
+/**
+ * \defgroup packedsz protobuf_c_message_get_packed_size() implementation
+ *
+ * Routines mainly used by protobuf_c_message_get_packed_size().
+ *
+ * \ingroup internal
+ * @{
+ */
+
+/**
+ * Return the number of bytes required to store the tag for the field. Includes
+ * 3 bits for the wire-type, and a single bit that denotes the end-of-tag.
+ *
+ * \param number
+ * Field tag to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-get_tag_size (unsigned number)
-{
- if (number < (1<<4))
- return 1;
- else if (number < (1<<11))
- return 2;
- else if (number < (1<<18))
- return 3;
- else if (number < (1<<25))
- return 4;
- else
- return 5;
-}
-
-/* Return the number of bytes required to store
- a variable-length unsigned integer that fits in 32-bit uint
- in base-128 encoding. */
+get_tag_size(unsigned number)
+{
+ if (number < (1 << 4)) {
+ return 1;
+ } else if (number < (1 << 11)) {
+ return 2;
+ } else if (number < (1 << 18)) {
+ return 3;
+ } else if (number < (1 << 25)) {
+ return 4;
+ } else {
+ return 5;
+ }
+}
+
+/**
+ * Return the number of bytes required to store a variable-length unsigned
+ * 32-bit integer in base-128 varint encoding.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-uint32_size (uint32_t v)
-{
- if (v < (1<<7))
- return 1;
- else if (v < (1<<14))
- return 2;
- else if (v < (1<<21))
- return 3;
- else if (v < (1<<28))
- return 4;
- else
- return 5;
-}
-/* Return the number of bytes required to store
- a variable-length signed integer that fits in 32-bit int
- in base-128 encoding. */
+uint32_size(uint32_t v)
+{
+ if (v < (1 << 7)) {
+ return 1;
+ } else if (v < (1 << 14)) {
+ return 2;
+ } else if (v < (1 << 21)) {
+ return 3;
+ } else if (v < (1 << 28)) {
+ return 4;
+ } else {
+ return 5;
+ }
+}
+
+/**
+ * Return the number of bytes required to store a variable-length signed 32-bit
+ * integer in base-128 varint encoding.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-int32_size (int32_t v)
-{
- if (v < 0)
- return 10;
- else if (v < (1<<7))
- return 1;
- else if (v < (1<<14))
- return 2;
- else if (v < (1<<21))
- return 3;
- else if (v < (1<<28))
- return 4;
- else
- return 5;
-}
-/* return the zigzag-encoded 32-bit unsigned int from a 32-bit signed int */
+int32_size(int32_t v)
+{
+ if (v < 0) {
+ return 10;
+ } else if (v < (1 << 7)) {
+ return 1;
+ } else if (v < (1 << 14)) {
+ return 2;
+ } else if (v < (1 << 21)) {
+ return 3;
+ } else if (v < (1 << 28)) {
+ return 4;
+ } else {
+ return 5;
+ }
+}
+
+/**
+ * Return the ZigZag-encoded 32-bit unsigned integer form of a 32-bit signed
+ * integer.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * ZigZag encoded integer.
+ */
static inline uint32_t
-zigzag32 (int32_t v)
+zigzag32(int32_t v)
{
- if (v < 0)
- return ((uint32_t)(-v)) * 2 - 1;
- else
- return v * 2;
+ if (v < 0)
+ return ((uint32_t) (-v)) * 2 - 1;
+ else
+ return v * 2;
}
-/* Return the number of bytes required to store
- a variable-length signed integer that fits in 32-bit int,
- converted to unsigned via the zig-zag algorithm,
- then packed using base-128 encoding. */
+
+/**
+ * Return the number of bytes required to store a signed 32-bit integer,
+ * converted to an unsigned 32-bit integer with ZigZag encoding, using base-128
+ * varint encoding.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-sint32_size (int32_t v)
+sint32_size(int32_t v)
{
- return uint32_size(zigzag32(v));
+ return uint32_size(zigzag32(v));
}
-/* Return the number of bytes required to store
- a variable-length unsigned integer that fits in 64-bit uint
- in base-128 encoding. */
+/**
+ * Return the number of bytes required to store a 64-bit unsigned integer in
+ * base-128 varint encoding.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-uint64_size (uint64_t v)
-{
- uint32_t upper_v = (uint32_t )(v>>32);
- if (upper_v == 0)
- return uint32_size ((uint32_t)v);
- else if (upper_v < (1<<3))
- return 5;
- else if (upper_v < (1<<10))
- return 6;
- else if (upper_v < (1<<17))
- return 7;
- else if (upper_v < (1<<24))
- return 8;
- else if (upper_v < (1U<<31))
- return 9;
- else
- return 10;
-}
-
-/* return the zigzag-encoded 64-bit unsigned int from a 64-bit signed int */
+uint64_size(uint64_t v)
+{
+ uint32_t upper_v = (uint32_t) (v >> 32);
+
+ if (upper_v == 0) {
+ return uint32_size((uint32_t) v);
+ } else if (upper_v < (1 << 3)) {
+ return 5;
+ } else if (upper_v < (1 << 10)) {
+ return 6;
+ } else if (upper_v < (1 << 17)) {
+ return 7;
+ } else if (upper_v < (1 << 24)) {
+ return 8;
+ } else if (upper_v < (1U << 31)) {
+ return 9;
+ } else {
+ return 10;
+ }
+}
+
+/**
+ * Return the ZigZag-encoded 64-bit unsigned integer form of a 64-bit signed
+ * integer.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * ZigZag encoded integer.
+ */
static inline uint64_t
-zigzag64 (int64_t v)
+zigzag64(int64_t v)
{
- if (v < 0)
- return ((uint64_t)(-v)) * 2 - 1;
- else
- return v * 2;
+ if (v < 0)
+ return ((uint64_t) (-v)) * 2 - 1;
+ else
+ return v * 2;
}
-/* Return the number of bytes required to store
- a variable-length signed integer that fits in 64-bit int,
- converted to unsigned via the zig-zag algorithm,
- then packed using base-128 encoding. */
+/**
+ * Return the number of bytes required to store a signed 64-bit integer,
+ * converted to an unsigned 64-bit integer with ZigZag encoding, using base-128
+ * varint encoding.
+ *
+ * \param v
+ * Value to encode.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-sint64_size (int64_t v)
+sint64_size(int64_t v)
{
- return uint64_size(zigzag64(v));
+ return uint64_size(zigzag64(v));
}
-/* Get serialized size of a single field in the message,
- including the space needed by the identifying tag. */
+/**
+ * Calculate the serialized size of a single required message field, including
+ * the space needed by the preceding tag.
+ *
+ * \param field
+ * Field descriptor for member.
+ * \param member
+ * Field to encode.
+ * \return
+ * Number of bytes required.
+ */
static size_t
-required_field_get_packed_size (const ProtobufCFieldDescriptor *field,
- const void *member)
-{
- size_t rv = get_tag_size (field->id);
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SINT32:
- return rv + sint32_size (*(const int32_t *) member);
- case PROTOBUF_C_TYPE_INT32:
- return rv + int32_size (*(const uint32_t *) member);
- case PROTOBUF_C_TYPE_UINT32:
- return rv + uint32_size (*(const uint32_t *) member);
- case PROTOBUF_C_TYPE_SINT64:
- return rv + sint64_size (*(const int64_t *) member);
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- return rv + uint64_size (*(const uint64_t *) member);
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- return rv + 4;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- return rv + 8;
- case PROTOBUF_C_TYPE_BOOL:
- return rv + 1;
- case PROTOBUF_C_TYPE_FLOAT:
- return rv + 4;
- case PROTOBUF_C_TYPE_DOUBLE:
- return rv + 8;
- case PROTOBUF_C_TYPE_ENUM:
- /* TODO: is this correct for negative-valued enums? */
- return rv + uint32_size (*(const uint32_t *) member);
- case PROTOBUF_C_TYPE_STRING:
- {
- const char *str = *(char * const *) member;
- size_t len = str ? strlen (str) : 0;
- return rv + uint32_size (len) + len;
- }
- case PROTOBUF_C_TYPE_BYTES:
- {
- size_t len = ((const ProtobufCBinaryData*) member)->len;
- return rv + uint32_size (len) + len;
- }
- /* case PROTOBUF_C_TYPE_GROUP: */
- case PROTOBUF_C_TYPE_MESSAGE:
- {
- const ProtobufCMessage *msg = * (ProtobufCMessage * const *) member;
- size_t subrv = msg ? protobuf_c_message_get_packed_size (msg) : 0;
- return rv + uint32_size (subrv) + subrv;
- }
- }
- PROTOBUF_C_ASSERT_NOT_REACHED ();
- return 0;
-}
-
-/* Get serialized size of a single optional field in the message,
- including the space needed by the identifying tag.
- Returns 0 if the optional field isn't set. */
+required_field_get_packed_size(const ProtobufCFieldDescriptor *field,
+ const void *member)
+{
+ size_t rv = get_tag_size(field->id);
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SINT32:
+ return rv + sint32_size(*(const int32_t *) member);
+ case PROTOBUF_C_TYPE_INT32:
+ return rv + int32_size(*(const uint32_t *) member);
+ case PROTOBUF_C_TYPE_UINT32:
+ return rv + uint32_size(*(const uint32_t *) member);
+ case PROTOBUF_C_TYPE_SINT64:
+ return rv + sint64_size(*(const int64_t *) member);
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ return rv + uint64_size(*(const uint64_t *) member);
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ return rv + 4;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ return rv + 8;
+ case PROTOBUF_C_TYPE_BOOL:
+ return rv + 1;
+ case PROTOBUF_C_TYPE_FLOAT:
+ return rv + 4;
+ case PROTOBUF_C_TYPE_DOUBLE:
+ return rv + 8;
+ case PROTOBUF_C_TYPE_ENUM:
+ /* \todo Is this correct for negative-valued enums? */
+ return rv + uint32_size(*(const uint32_t *) member);
+ case PROTOBUF_C_TYPE_STRING: {
+ const char *str = *(char * const *) member;
+ size_t len = str ? strlen(str) : 0;
+ return rv + uint32_size(len) + len;
+ }
+ case PROTOBUF_C_TYPE_BYTES: {
+ size_t len = ((const ProtobufCBinaryData *) member)->len;
+ return rv + uint32_size(len) + len;
+ }
+ case PROTOBUF_C_TYPE_MESSAGE: {
+ const ProtobufCMessage *msg = *(ProtobufCMessage * const *) member;
+ size_t subrv = msg ? protobuf_c_message_get_packed_size(msg) : 0;
+ return rv + uint32_size(subrv) + subrv;
+ }
+ }
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ return 0;
+}
+
+/**
+ * Calculate the serialized size of a single optional message field, including
+ * the space needed by the preceding tag. Returns 0 if the optional field isn't
+ * set.
+ *
+ * \param field
+ * Field descriptor for member.
+ * \param has
+ * True if the field exists, false if not.
+ * \param member
+ * Field to encode.
+ * \return
+ * Number of bytes required.
+ */
static size_t
-optional_field_get_packed_size (const ProtobufCFieldDescriptor *field,
- const protobuf_c_boolean *has,
- const void *member)
-{
- if (field->type == PROTOBUF_C_TYPE_MESSAGE
- || field->type == PROTOBUF_C_TYPE_STRING)
- {
- const void *ptr = * (const void * const *) member;
- if (ptr == NULL
- || ptr == field->default_value)
- return 0;
- }
- else
- {
- if (!*has)
- return 0;
- }
- return required_field_get_packed_size (field, member);
-}
-
-/* Get serialized size of a repeated field in the message,
- which may consist of any number of values (including 0).
- Includes the space needed by the identifying tags (as needed). */
+optional_field_get_packed_size(const ProtobufCFieldDescriptor *field,
+ const protobuf_c_boolean *has,
+ const void *member)
+{
+ if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
+ field->type == PROTOBUF_C_TYPE_STRING)
+ {
+ const void *ptr = *(const void * const *) member;
+ if (ptr == NULL || ptr == field->default_value)
+ return 0;
+ } else {
+ if (!*has)
+ return 0;
+ }
+ return required_field_get_packed_size(field, member);
+}
+
+/**
+ * Calculate the serialized size of repeated message fields, which may consist
+ * of any number of values (including 0). Includes the space needed by the
+ * preceding tags (as needed).
+ *
+ * \param field
+ * Field descriptor for member.
+ * \param count
+ * Number of repeated field members.
+ * \param member
+ * Field to encode.
+ * \return
+ * Number of bytes required.
+ */
static size_t
-repeated_field_get_packed_size (const ProtobufCFieldDescriptor *field,
- size_t count,
- const void *member)
-{
- size_t header_size;
- size_t rv = 0;
- unsigned i;
- void *array = * (void * const *) member;
- if (count == 0)
- return 0;
- header_size = get_tag_size (field->id);
- if (!field->packed)
- header_size *= count;
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SINT32:
- for (i = 0; i < count; i++)
- rv += sint32_size (((int32_t*)array)[i]);
- break;
- case PROTOBUF_C_TYPE_INT32:
- for (i = 0; i < count; i++)
- rv += int32_size (((uint32_t*)array)[i]);
- break;
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_ENUM:
- for (i = 0; i < count; i++)
- rv += uint32_size (((uint32_t*)array)[i]);
- break;
- case PROTOBUF_C_TYPE_SINT64:
- for (i = 0; i < count; i++)
- rv += sint64_size (((int64_t*)array)[i]);
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- for (i = 0; i < count; i++)
- rv += uint64_size (((uint64_t*)array)[i]);
- break;
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- rv += 4 * count;
- break;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- rv += 8 * count;
- break;
- case PROTOBUF_C_TYPE_BOOL:
- rv += count;
- break;
- case PROTOBUF_C_TYPE_STRING:
- for (i = 0; i < count; i++)
- {
- size_t len = strlen (((char**) array)[i]);
- rv += uint32_size (len) + len;
- }
- break;
-
- case PROTOBUF_C_TYPE_BYTES:
- for (i = 0; i < count; i++)
- {
- size_t len = ((ProtobufCBinaryData*) array)[i].len;
- rv += uint32_size (len) + len;
- }
- break;
- case PROTOBUF_C_TYPE_MESSAGE:
- for (i = 0; i < count; i++)
- {
- size_t len = protobuf_c_message_get_packed_size (((ProtobufCMessage **) array)[i]);
- rv += uint32_size (len) + len;
- }
- break;
- /* case PROTOBUF_C_TYPE_GROUP: // NOT SUPPORTED */
- }
- if (field->packed)
- header_size += uint32_size (rv);
- return header_size + rv;
-}
-
-/* Get the packed size of a unknown field (meaning one that
- is passed through mostly uninterpreted... this is done
- for forward compatibilty with the addition of new fields). */
+repeated_field_get_packed_size(const ProtobufCFieldDescriptor *field,
+ size_t count, const void *member)
+{
+ size_t header_size;
+ size_t rv = 0;
+ unsigned i;
+ void *array = *(void * const *) member;
+
+ if (count == 0)
+ return 0;
+ header_size = get_tag_size(field->id);
+ if (0 == (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED))
+ header_size *= count;
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SINT32:
+ for (i = 0; i < count; i++)
+ rv += sint32_size(((int32_t *) array)[i]);
+ break;
+ case PROTOBUF_C_TYPE_INT32:
+ for (i = 0; i < count; i++)
+ rv += int32_size(((uint32_t *) array)[i]);
+ break;
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_ENUM:
+ for (i = 0; i < count; i++)
+ rv += uint32_size(((uint32_t *) array)[i]);
+ break;
+ case PROTOBUF_C_TYPE_SINT64:
+ for (i = 0; i < count; i++)
+ rv += sint64_size(((int64_t *) array)[i]);
+ break;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ for (i = 0; i < count; i++)
+ rv += uint64_size(((uint64_t *) array)[i]);
+ break;
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ rv += 4 * count;
+ break;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ rv += 8 * count;
+ break;
+ case PROTOBUF_C_TYPE_BOOL:
+ rv += count;
+ break;
+ case PROTOBUF_C_TYPE_STRING:
+ for (i = 0; i < count; i++) {
+ size_t len = strlen(((char **) array)[i]);
+ rv += uint32_size(len) + len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_BYTES:
+ for (i = 0; i < count; i++) {
+ size_t len = ((ProtobufCBinaryData *) array)[i].len;
+ rv += uint32_size(len) + len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_MESSAGE:
+ for (i = 0; i < count; i++) {
+ size_t len = protobuf_c_message_get_packed_size(
+ ((ProtobufCMessage **) array)[i]);
+ rv += uint32_size(len) + len;
+ }
+ break;
+ }
+
+ if (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED))
+ header_size += uint32_size(rv);
+ return header_size + rv;
+}
+
+/**
+ * Calculate the serialized size of an unknown field, i.e. one that is passed
+ * through mostly uninterpreted. This is required for forward compatibility if
+ * new fields are added to the message descriptor.
+ *
+ * \param field
+ * Unknown field type.
+ * \return
+ * Number of bytes required.
+ */
static inline size_t
-unknown_field_get_packed_size (const ProtobufCMessageUnknownField *field)
+unknown_field_get_packed_size(const ProtobufCMessageUnknownField *field)
{
- return get_tag_size (field->tag) + field->len;
+ return get_tag_size(field->tag) + field->len;
}
-/* Get the number of bytes that the message will occupy once serialized. */
-size_t
-protobuf_c_message_get_packed_size(const ProtobufCMessage *message)
-{
- unsigned i;
- size_t rv = 0;
- ASSERT_IS_MESSAGE (message);
- for (i = 0; i < message->descriptor->n_fields; i++)
- {
- const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
- const void *member = ((const char *) message) + field->offset;
- const void *qmember = ((const char *) message) + field->quantifier_offset;
-
- if (field->label == PROTOBUF_C_LABEL_REQUIRED)
- rv += required_field_get_packed_size (field, member);
- else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
- rv += optional_field_get_packed_size (field, qmember, member);
- else
- rv += repeated_field_get_packed_size (field, * (const size_t *) qmember, member);
- }
- for (i = 0; i < message->n_unknown_fields; i++)
- rv += unknown_field_get_packed_size (&message->unknown_fields[i]);
- return rv;
-}
-/* === pack() === */
-/* Pack an unsigned 32-bit integer in base-128 encoding, and return the number of bytes needed:
- this will be 5 or less. */
-static inline size_t
-uint32_pack (uint32_t value, uint8_t *out)
-{
- unsigned rv = 0;
- if (value >= 0x80)
- {
- out[rv++] = value | 0x80;
- value >>= 7;
- if (value >= 0x80)
- {
- out[rv++] = value | 0x80;
- value >>= 7;
- if (value >= 0x80)
- {
- out[rv++] = value | 0x80;
- value >>= 7;
- if (value >= 0x80)
- {
- out[rv++] = value | 0x80;
- value >>= 7;
- }
- }
- }
- }
- /* assert: value<128 */
- out[rv++] = value;
- return rv;
-}
+/**@}*/
+
+/*
+ * Calculate the serialized size of the message.
+ */
+size_t protobuf_c_message_get_packed_size(const ProtobufCMessage *message)
+{
+ unsigned i;
+ size_t rv = 0;
+
+ ASSERT_IS_MESSAGE(message);
+ for (i = 0; i < message->descriptor->n_fields; i++) {
+ const ProtobufCFieldDescriptor *field =
+ message->descriptor->fields + i;
+ const void *member =
+ ((const char *) message) + field->offset;
+ const void *qmember =
+ ((const char *) message) + field->quantifier_offset;
+
+ if (field->label == PROTOBUF_C_LABEL_REQUIRED) {
+ rv += required_field_get_packed_size(field, member);
+ } else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
+ rv += optional_field_get_packed_size(field, qmember, member);
+ } else {
+ rv += repeated_field_get_packed_size(
+ field,
+ *(const size_t *) qmember,
+ member
+ );
+ }
+ }
+ for (i = 0; i < message->n_unknown_fields; i++)
+ rv += unknown_field_get_packed_size(&message->unknown_fields[i]);
+ return rv;
+}
+
+/**
+ * \defgroup pack protobuf_c_message_pack() implementation
+ *
+ * Routines mainly used by protobuf_c_message_pack().
+ *
+ * \ingroup internal
+ * @{
+ */
-/* Pack a 32-bit signed integer, returning the number of bytes needed.
- Negative numbers are packed as twos-complement 64-bit integers. */
+/**
+ * Pack an unsigned 32-bit integer in base-128 varint encoding and return the
+ * number of bytes written, which must be 5 or less.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-int32_pack (int32_t value, uint8_t *out)
-{
- if (value < 0)
- {
- out[0] = value | 0x80;
- out[1] = (value>>7) | 0x80;
- out[2] = (value>>14) | 0x80;
- out[3] = (value>>21) | 0x80;
- out[4] = (value>>28) | 0x80;
- out[5] = out[6] = out[7] = out[8] = 0xff;
- out[9] = 0x01;
- return 10;
- }
- else
- return uint32_pack (value, out);
-}
-
-/* Pack a 32-bit integer in zigzag encoding. */
+uint32_pack(uint32_t value, uint8_t *out)
+{
+ unsigned rv = 0;
+
+ if (value >= 0x80) {
+ out[rv++] = value | 0x80;
+ value >>= 7;
+ if (value >= 0x80) {
+ out[rv++] = value | 0x80;
+ value >>= 7;
+ if (value >= 0x80) {
+ out[rv++] = value | 0x80;
+ value >>= 7;
+ if (value >= 0x80) {
+ out[rv++] = value | 0x80;
+ value >>= 7;
+ }
+ }
+ }
+ }
+ /* assert: value<128 */
+ out[rv++] = value;
+ return rv;
+}
+
+/**
+ * Pack a signed 32-bit integer and return the number of bytes written.
+ * Negative numbers are encoded as two's complement 64-bit integers.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
+static inline size_t
+int32_pack(int32_t value, uint8_t *out)
+{
+ if (value < 0) {
+ out[0] = value | 0x80;
+ out[1] = (value >> 7) | 0x80;
+ out[2] = (value >> 14) | 0x80;
+ out[3] = (value >> 21) | 0x80;
+ out[4] = (value >> 28) | 0x80;
+ out[5] = out[6] = out[7] = out[8] = 0xff;
+ out[9] = 0x01;
+ return 10;
+ } else {
+ return uint32_pack(value, out);
+ }
+}
+
+/**
+ * Pack a signed 32-bit integer using ZigZag encoding and return the number of
+ * bytes written.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-sint32_pack (int32_t value, uint8_t *out)
+sint32_pack(int32_t value, uint8_t *out)
{
- return uint32_pack (zigzag32 (value), out);
+ return uint32_pack(zigzag32(value), out);
}
-/* Pack a 64-bit unsigned integer that fits in a 64-bit uint,
- using base-128 encoding. */
+/**
+ * Pack a 64-bit unsigned integer using base-128 varint encoding and return the
+ * number of bytes written.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static size_t
-uint64_pack (uint64_t value, uint8_t *out)
-{
- uint32_t hi = (uint32_t )(value>>32);
- uint32_t lo = (uint32_t )value;
- unsigned rv;
- if (hi == 0)
- return uint32_pack ((uint32_t)lo, out);
- out[0] = (lo) | 0x80;
- out[1] = (lo>>7) | 0x80;
- out[2] = (lo>>14) | 0x80;
- out[3] = (lo>>21) | 0x80;
- if (hi < 8)
- {
- out[4] = (hi<<4) | (lo>>28);
- return 5;
- }
- else
- {
- out[4] = ((hi&7)<<4) | (lo>>28) | 0x80;
- hi >>= 3;
- }
- rv = 5;
- while (hi >= 128)
- {
- out[rv++] = hi | 0x80;
- hi >>= 7;
- }
- out[rv++] = hi;
- return rv;
-}
-
-/* Pack a 64-bit signed integer in zigzan encoding,
- return the size of the packed output.
- (Max returned value is 10) */
+uint64_pack(uint64_t value, uint8_t *out)
+{
+ uint32_t hi = (uint32_t) (value >> 32);
+ uint32_t lo = (uint32_t) value;
+ unsigned rv;
+
+ if (hi == 0)
+ return uint32_pack((uint32_t) lo, out);
+ out[0] = (lo) | 0x80;
+ out[1] = (lo >> 7) | 0x80;
+ out[2] = (lo >> 14) | 0x80;
+ out[3] = (lo >> 21) | 0x80;
+ if (hi < 8) {
+ out[4] = (hi << 4) | (lo >> 28);
+ return 5;
+ } else {
+ out[4] = ((hi & 7) << 4) | (lo >> 28) | 0x80;
+ hi >>= 3;
+ }
+ rv = 5;
+ while (hi >= 128) {
+ out[rv++] = hi | 0x80;
+ hi >>= 7;
+ }
+ out[rv++] = hi;
+ return rv;
+}
+
+/**
+ * Pack a 64-bit signed integer in ZigZag encoding and return the number of
+ * bytes written.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-sint64_pack (int64_t value, uint8_t *out)
+sint64_pack(int64_t value, uint8_t *out)
{
- return uint64_pack (zigzag64 (value), out);
+ return uint64_pack(zigzag64(value), out);
}
-/* Pack a 32-bit value, little-endian.
- Used for fixed32, sfixed32, float) */
+/**
+ * Pack a 32-bit quantity in little-endian byte order. Used for protobuf wire
+ * types fixed32, sfixed32, float. Similar to "htole32".
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-fixed32_pack (uint32_t value, void *out)
+fixed32_pack(uint32_t value, void *out)
{
-#if IS_LITTLE_ENDIAN
- memcpy (out, &value, 4);
+#if !defined(WORDS_BIGENDIAN)
+ memcpy(out, &value, 4);
#else
- uint8_t *buf = out;
- buf[0] = value;
- buf[1] = value>>8;
- buf[2] = value>>16;
- buf[3] = value>>24;
+ uint8_t *buf = out;
+
+ buf[0] = value;
+ buf[1] = value >> 8;
+ buf[2] = value >> 16;
+ buf[3] = value >> 24;
#endif
- return 4;
+ return 4;
}
-/* Pack a 64-bit fixed-length value.
- (Used for fixed64, sfixed64, double) */
-/* XXX: the big-endian impl is really only good for 32-bit machines,
- a 64-bit version would be appreciated, plus a way
- to decide to use 64-bit math where convenient. */
+/**
+ * Pack a 64-bit quantity in little-endian byte order. Used for protobuf wire
+ * types fixed64, sfixed64, double. Similar to "htole64".
+ *
+ * \todo The big-endian impl is really only good for 32-bit machines, a 64-bit
+ * version would be appreciated, plus a way to decide to use 64-bit math where
+ * convenient.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-fixed64_pack (uint64_t value, void *out)
+fixed64_pack(uint64_t value, void *out)
{
-#if IS_LITTLE_ENDIAN
- memcpy (out, &value, 8);
+#if !defined(WORDS_BIGENDIAN)
+ memcpy(out, &value, 8);
#else
- fixed32_pack (value, out);
- fixed32_pack (value>>32, ((char*)out)+4);
+ fixed32_pack(value, out);
+ fixed32_pack(value >> 32, ((char *) out) + 4);
#endif
- return 8;
+ return 8;
}
-
-/* Pack a boolean as 0 or 1, even though the protobuf_c_boolean
- can really assume any integer value. */
-/* XXX: perhaps on some platforms "*out = !!value" would be
- a better impl, b/c that is idiotmatic c++ in some stl impls. */
+/**
+ * Pack a boolean value as an integer and return the number of bytes written.
+ *
+ * \todo Perhaps on some platforms *out = !!value would be a better impl, b/c
+ * that is idiomatic C++ in some STL implementations.
+ *
+ * \param value
+ * Value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-boolean_pack (protobuf_c_boolean value, uint8_t *out)
+boolean_pack(protobuf_c_boolean value, uint8_t *out)
{
- *out = value ? 1 : 0;
- return 1;
+ *out = value ? TRUE : FALSE;
+ return 1;
}
-/* Pack a length-prefixed string.
- The input string is NUL-terminated.
-
- The NULL pointer is treated as an empty string.
- This isn't really necessary, but it allows people
- to leave required strings blank.
- (See Issue 13 in the bug tracker for a
- little more explanation).
+/**
+ * Pack a NUL-terminated C string and return the number of bytes written. The
+ * output includes a length delimiter.
+ *
+ * The NULL pointer is treated as an empty string. This isn't really necessary,
+ * but it allows people to leave required strings blank. (See Issue #13 in the
+ * bug tracker for a little more explanation).
+ *
+ * \param str
+ * String to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
*/
static inline size_t
-string_pack (const char * str, uint8_t *out)
-{
- if (str == NULL)
- {
- out[0] = 0;
- return 1;
- }
- else
- {
- size_t len = strlen (str);
- size_t rv = uint32_pack (len, out);
- memcpy (out + rv, str, len);
- return rv + len;
- }
-}
-
+string_pack(const char *str, uint8_t *out)
+{
+ if (str == NULL) {
+ out[0] = 0;
+ return 1;
+ } else {
+ size_t len = strlen(str);
+ size_t rv = uint32_pack(len, out);
+ memcpy(out + rv, str, len);
+ return rv + len;
+ }
+}
+
+/**
+ * Pack a ProtobufCBinaryData and return the number of bytes written. The output
+ * includes a length delimiter.
+ *
+ * \param bd
+ * ProtobufCBinaryData to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-binary_data_pack (const ProtobufCBinaryData *bd, uint8_t *out)
+binary_data_pack(const ProtobufCBinaryData *bd, uint8_t *out)
{
- size_t len = bd->len;
- size_t rv = uint32_pack (len, out);
- memcpy (out + rv, bd->data, len);
- return rv + len;
+ size_t len = bd->len;
+ size_t rv = uint32_pack(len, out);
+ memcpy(out + rv, bd->data, len);
+ return rv + len;
}
+/**
+ * Pack a ProtobufCMessage and return the number of bytes written. The output
+ * includes a length delimiter.
+ *
+ * \param message
+ * ProtobufCMessage object to pack.
+ * \param[out] out
+ * Packed message.
+ * \return
+ * Number of bytes written to `out`.
+ */
static inline size_t
-prefixed_message_pack (const ProtobufCMessage *message, uint8_t *out)
-{
- if (message == NULL)
- {
- out[0] = 0;
- return 1;
- }
- else
- {
- size_t rv = protobuf_c_message_pack (message, out + 1);
- uint32_t rv_packed_size = uint32_size (rv);
- if (rv_packed_size != 1)
- memmove (out + rv_packed_size, out + 1, rv);
- return uint32_pack (rv, out) + rv;
- }
-}
-
-/* wire-type will be added in required_field_pack() */
-/* XXX: just call uint64_pack on 64-bit platforms. */
+prefixed_message_pack(const ProtobufCMessage *message, uint8_t *out)
+{
+ if (message == NULL) {
+ out[0] = 0;
+ return 1;
+ } else {
+ size_t rv = protobuf_c_message_pack(message, out + 1);
+ uint32_t rv_packed_size = uint32_size(rv);
+ if (rv_packed_size != 1)
+ memmove(out + rv_packed_size, out + 1, rv);
+ return uint32_pack(rv, out) + rv;
+ }
+}
+
+/**
+ * Pack a field tag.
+ *
+ * Wire-type will be added in required_field_pack().
+ *
+ * \todo Just call uint64_pack on 64-bit platforms.
+ *
+ * \param id
+ * Tag value to encode.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static size_t
-tag_pack (uint32_t id, uint8_t *out)
+tag_pack(uint32_t id, uint8_t *out)
{
- if (id < (1<<(32-3)))
- return uint32_pack (id<<3, out);
- else
- return uint64_pack (((uint64_t)id) << 3, out);
+ if (id < (1 << (32 - 3)))
+ return uint32_pack(id << 3, out);
+ else
+ return uint64_pack(((uint64_t) id) << 3, out);
}
+/**
+ * Pack a required field and return the number of bytes written.
+ *
+ * \param field
+ * Field descriptor.
+ * \param member
+ * The field member.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static size_t
-required_field_pack (const ProtobufCFieldDescriptor *field,
- const void *member,
- uint8_t *out)
-{
- size_t rv = tag_pack (field->id, out);
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SINT32:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + sint32_pack (*(const int32_t *) member, out + rv);
- case PROTOBUF_C_TYPE_INT32:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + int32_pack (*(const uint32_t *) member, out + rv);
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_ENUM:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + uint32_pack (*(const uint32_t *) member, out + rv);
- case PROTOBUF_C_TYPE_SINT64:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + sint64_pack (*(const int64_t *) member, out + rv);
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + uint64_pack (*(const uint64_t *) member, out + rv);
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- out[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
- return rv + fixed32_pack (*(const uint32_t *) member, out + rv);
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- out[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
- return rv + fixed64_pack (*(const uint64_t *) member, out + rv);
- case PROTOBUF_C_TYPE_BOOL:
- out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- return rv + boolean_pack (*(const protobuf_c_boolean *) member, out + rv);
- case PROTOBUF_C_TYPE_STRING:
- {
- out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- return rv + string_pack (*(char * const *) member, out + rv);
- }
-
- case PROTOBUF_C_TYPE_BYTES:
- {
- const ProtobufCBinaryData * bd = ((const ProtobufCBinaryData*) member);
- out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- return rv + binary_data_pack (bd, out + rv);
- }
- /* case PROTOBUF_C_TYPE_GROUP: // NOT SUPPORTED */
- case PROTOBUF_C_TYPE_MESSAGE:
- {
- out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- return rv + prefixed_message_pack (*(ProtobufCMessage * const *) member,
- out + rv);
- }
- }
- PROTOBUF_C_ASSERT_NOT_REACHED ();
- return 0;
-}
+required_field_pack(const ProtobufCFieldDescriptor *field,
+ const void *member, uint8_t *out)
+{
+ size_t rv = tag_pack(field->id, out);
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SINT32:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + sint32_pack(*(const int32_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_INT32:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + int32_pack(*(const uint32_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_ENUM:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + uint32_pack(*(const uint32_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_SINT64:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + sint64_pack(*(const int64_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + uint64_pack(*(const uint64_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
+ return rv + fixed32_pack(*(const uint32_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
+ return rv + fixed64_pack(*(const uint64_t *) member, out + rv);
+ case PROTOBUF_C_TYPE_BOOL:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ return rv + boolean_pack(*(const protobuf_c_boolean *) member, out + rv);
+ case PROTOBUF_C_TYPE_STRING:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ return rv + string_pack(*(char *const *) member, out + rv);
+ case PROTOBUF_C_TYPE_BYTES:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ return rv + binary_data_pack((const ProtobufCBinaryData *) member, out + rv);
+ case PROTOBUF_C_TYPE_MESSAGE:
+ out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ return rv + prefixed_message_pack(*(ProtobufCMessage * const *) member, out + rv);
+ }
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ return 0;
+}
+
+/**
+ * Pack an optional field and return the number of bytes written.
+ *
+ * \param field
+ * Field descriptor.
+ * \param has
+ * Whether the field is set.
+ * \param member
+ * The field member.
+ * \param[out] out
+ * Packed value.
+ * \return
+ * Number of bytes written to `out`.
+ */
static size_t
-optional_field_pack (const ProtobufCFieldDescriptor *field,
- const protobuf_c_boolean *has,
- const void *member,
- uint8_t *out)
-{
- if (field->type == PROTOBUF_C_TYPE_MESSAGE
- || field->type == PROTOBUF_C_TYPE_STRING)
- {
- const void *ptr = * (const void * const *) member;
- if (ptr == NULL
- || ptr == field->default_value)
- return 0;
- }
- else
- {
- if (!*has)
- return 0;
- }
- return required_field_pack (field, member, out);
-}
-
-/* TODO: implement as a table lookup */
+optional_field_pack(const ProtobufCFieldDescriptor *field,
+ const protobuf_c_boolean *has,
+ const void *member, uint8_t *out)
+{
+ if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
+ field->type == PROTOBUF_C_TYPE_STRING)
+ {
+ const void *ptr = *(const void * const *) member;
+ if (ptr == NULL || ptr == field->default_value)
+ return 0;
+ } else {
+ if (!*has)
+ return 0;
+ }
+ return required_field_pack(field, member, out);
+}
+
+/**
+ * Given a field type, return the in-memory size.
+ *
+ * \todo Implement as a table lookup.
+ *
+ * \param type
+ * Field type.
+ * \return
+ * Size of the field.
+ */
static inline size_t
-sizeof_elt_in_repeated_array (ProtobufCType type)
-{
- switch (type)
- {
- case PROTOBUF_C_TYPE_SINT32:
- case PROTOBUF_C_TYPE_INT32:
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- case PROTOBUF_C_TYPE_ENUM:
- return 4;
- case PROTOBUF_C_TYPE_SINT64:
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- return 8;
- case PROTOBUF_C_TYPE_BOOL:
- return sizeof (protobuf_c_boolean);
- case PROTOBUF_C_TYPE_STRING:
- case PROTOBUF_C_TYPE_MESSAGE:
- return sizeof (void *);
- case PROTOBUF_C_TYPE_BYTES:
- return sizeof (ProtobufCBinaryData);
- }
- PROTOBUF_C_ASSERT_NOT_REACHED ();
- return 0;
-}
-
+sizeof_elt_in_repeated_array(ProtobufCType type)
+{
+ switch (type) {
+ case PROTOBUF_C_TYPE_SINT32:
+ case PROTOBUF_C_TYPE_INT32:
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ case PROTOBUF_C_TYPE_ENUM:
+ return 4;
+ case PROTOBUF_C_TYPE_SINT64:
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ return 8;
+ case PROTOBUF_C_TYPE_BOOL:
+ return sizeof(protobuf_c_boolean);
+ case PROTOBUF_C_TYPE_STRING:
+ case PROTOBUF_C_TYPE_MESSAGE:
+ return sizeof(void *);
+ case PROTOBUF_C_TYPE_BYTES:
+ return sizeof(ProtobufCBinaryData);
+ }
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ return 0;
+}
+
+/**
+ * Pack an array of 32-bit quantities.
+ *
+ * \param[out] out
+ * Destination.
+ * \param[in] in
+ * Source.
+ * \param[in] n
+ * Number of elements in the source array.
+ */
static void
-copy_to_little_endian_32 (void *out, const void *in, unsigned N)
+copy_to_little_endian_32(void *out, const void *in, const unsigned n)
{
-#if IS_LITTLE_ENDIAN
- memcpy (out, in, N * 4);
+#if !defined(WORDS_BIGENDIAN)
+ memcpy(out, in, n * 4);
#else
- unsigned i;
- const uint32_t *ini = in;
- for (i = 0; i < N; i++)
- fixed32_pack (ini[i], (uint32_t*)out + i);
+ unsigned i;
+ const uint32_t *ini = in;
+ for (i = 0; i < n; i++)
+ fixed32_pack(ini[i], (uint32_t *) out + i);
#endif
}
+
+/**
+ * Pack an array of 64-bit quantities.
+ *
+ * \param[out] out
+ * Destination.
+ * \param[in] in
+ * Source.
+ * \param[in] n
+ * Number of elements in the source array.
+ */
static void
-copy_to_little_endian_64 (void *out, const void *in, unsigned N)
+copy_to_little_endian_64(void *out, const void *in, const unsigned n)
{
-#if IS_LITTLE_ENDIAN
- memcpy (out, in, N * 8);
+#if !defined(WORDS_BIGENDIAN)
+ memcpy(out, in, n * 8);
#else
- unsigned i;
- const uint64_t *ini = in;
- for (i = 0; i < N; i++)
- fixed64_pack (ini[i], (uint64_t*)out + i);
+ unsigned i;
+ const uint64_t *ini = in;
+ for (i = 0; i < n; i++)
+ fixed64_pack(ini[i], (uint64_t *) out + i);
#endif
}
+/**
+ * Get the minimum number of bytes required to pack a field value of a
+ * particular type.
+ *
+ * \param type
+ * Field type.
+ * \return
+ * Number of bytes.
+ */
static unsigned
-get_type_min_size (ProtobufCType type)
-{
- if (type == PROTOBUF_C_TYPE_SFIXED32
- || type == PROTOBUF_C_TYPE_FIXED32
- || type == PROTOBUF_C_TYPE_FLOAT)
- return 4;
- if (type == PROTOBUF_C_TYPE_SFIXED64
- || type == PROTOBUF_C_TYPE_FIXED64
- || type == PROTOBUF_C_TYPE_DOUBLE)
- return 8;
- return 1;
-}
-
+get_type_min_size(ProtobufCType type)
+{
+ if (type == PROTOBUF_C_TYPE_SFIXED32 ||
+ type == PROTOBUF_C_TYPE_FIXED32 ||
+ type == PROTOBUF_C_TYPE_FLOAT)
+ {
+ return 4;
+ }
+ if (type == PROTOBUF_C_TYPE_SFIXED64 ||
+ type == PROTOBUF_C_TYPE_FIXED64 ||
+ type == PROTOBUF_C_TYPE_DOUBLE)
+ {
+ return 8;
+ }
+ return 1;
+}
+
+/**
+ * Packs the elements of a repeated field and returns the serialised field and
+ * its length.
+ *
+ * \param field
+ * Field descriptor.
+ * \param count
+ * Number of elements in the repeated field array.
+ * \param member
+ * Pointer to the elements for this repeated field.
+ * \param[out] out
+ * Serialised representation of the repeated field.
+ * \return
+ * Number of bytes serialised to `out`.
+ */
static size_t
-repeated_field_pack (const ProtobufCFieldDescriptor *field,
- size_t count,
- const void *member,
- uint8_t *out)
-{
- void *array = * (char * const *) member;
- unsigned i;
- if (field->packed)
- {
- unsigned header_len;
- unsigned len_start;
- unsigned min_length;
- unsigned payload_len;
- unsigned length_size_min;
- unsigned actual_length_size;
- uint8_t *payload_at;
- if (count == 0)
- return 0;
- header_len = tag_pack (field->id, out);
- out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- len_start = header_len;
- min_length = get_type_min_size (field->type) * count;
- length_size_min = uint32_size (min_length);
- header_len += length_size_min;
- payload_at = out + header_len;
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- copy_to_little_endian_32 (payload_at, array, count);
- payload_at += count * 4;
- break;
-
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- copy_to_little_endian_64 (payload_at, array, count);
- payload_at += count * 8;
- break;
-
- case PROTOBUF_C_TYPE_INT32:
- {
- const int32_t *arr = (const int32_t *) array;
- for (i = 0; i < count; i++)
- payload_at += int32_pack (arr[i], payload_at);
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT32:
- {
- const int32_t *arr = (const int32_t *) array;
- for (i = 0; i < count; i++)
- payload_at += sint32_pack (arr[i], payload_at);
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT64:
- {
- const int64_t *arr = (const int64_t *) array;
- for (i = 0; i < count; i++)
- payload_at += sint64_pack (arr[i], payload_at);
- }
- break;
- case PROTOBUF_C_TYPE_ENUM:
- case PROTOBUF_C_TYPE_UINT32:
- {
- const uint32_t *arr = (const uint32_t *) array;
- for (i = 0; i < count; i++)
- payload_at += uint32_pack (arr[i], payload_at);
- }
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- {
- const uint64_t *arr = (const uint64_t *) array;
- for (i = 0; i < count; i++)
- payload_at += uint64_pack (arr[i], payload_at);
- }
- break;
- case PROTOBUF_C_TYPE_BOOL:
- {
- const protobuf_c_boolean *arr = (const protobuf_c_boolean *) array;
- for (i = 0; i < count; i++)
- payload_at += boolean_pack (arr[i], payload_at);
- }
- break;
-
- default:
- assert (0);
- }
- payload_len = payload_at - (out + header_len);
- actual_length_size = uint32_size (payload_len);
- if (length_size_min != actual_length_size)
- {
- assert (actual_length_size == length_size_min + 1);
- memmove (out + header_len + 1, out + header_len, payload_len);
- header_len++;
- }
- uint32_pack (payload_len, out + len_start);
- return header_len + payload_len;
- }
- else
- {
- /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
- size_t rv = 0;
- unsigned siz = sizeof_elt_in_repeated_array (field->type);
- for (i = 0; i < count; i++)
- {
- rv += required_field_pack (field, array, out + rv);
- array = ((char*)array) + siz;
- }
- return rv;
- }
+repeated_field_pack(const ProtobufCFieldDescriptor *field,
+ size_t count, const void *member, uint8_t *out)
+{
+ void *array = *(void * const *) member;
+ unsigned i;
+
+ if (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED)) {
+ unsigned header_len;
+ unsigned len_start;
+ unsigned min_length;
+ unsigned payload_len;
+ unsigned length_size_min;
+ unsigned actual_length_size;
+ uint8_t *payload_at;
+
+ if (count == 0)
+ return 0;
+ header_len = tag_pack(field->id, out);
+ out[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ len_start = header_len;
+ min_length = get_type_min_size(field->type) * count;
+ length_size_min = uint32_size(min_length);
+ header_len += length_size_min;
+ payload_at = out + header_len;
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ copy_to_little_endian_32(payload_at, array, count);
+ payload_at += count * 4;
+ break;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ copy_to_little_endian_64(payload_at, array, count);
+ payload_at += count * 8;
+ break;
+ case PROTOBUF_C_TYPE_INT32: {
+ const int32_t *arr = (const int32_t *) array;
+ for (i = 0; i < count; i++)
+ payload_at += int32_pack(arr[i], payload_at);
+ break;
+ }
+ case PROTOBUF_C_TYPE_SINT32: {
+ const int32_t *arr = (const int32_t *) array;
+ for (i = 0; i < count; i++)
+ payload_at += sint32_pack(arr[i], payload_at);
+ break;
+ }
+ case PROTOBUF_C_TYPE_SINT64: {
+ const int64_t *arr = (const int64_t *) array;
+ for (i = 0; i < count; i++)
+ payload_at += sint64_pack(arr[i], payload_at);
+ break;
+ }
+ case PROTOBUF_C_TYPE_ENUM:
+ case PROTOBUF_C_TYPE_UINT32: {
+ const uint32_t *arr = (const uint32_t *) array;
+ for (i = 0; i < count; i++)
+ payload_at += uint32_pack(arr[i], payload_at);
+ break;
+ }
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64: {
+ const uint64_t *arr = (const uint64_t *) array;
+ for (i = 0; i < count; i++)
+ payload_at += uint64_pack(arr[i], payload_at);
+ break;
+ }
+ case PROTOBUF_C_TYPE_BOOL: {
+ const protobuf_c_boolean *arr = (const protobuf_c_boolean *) array;
+ for (i = 0; i < count; i++)
+ payload_at += boolean_pack(arr[i], payload_at);
+ break;
+ }
+ default:
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ }
+
+ payload_len = payload_at - (out + header_len);
+ actual_length_size = uint32_size(payload_len);
+ if (length_size_min != actual_length_size) {
+ assert(actual_length_size == length_size_min + 1);
+ memmove(out + header_len + 1, out + header_len,
+ payload_len);
+ header_len++;
+ }
+ uint32_pack(payload_len, out + len_start);
+ return header_len + payload_len;
+ } else {
+ /* not "packed" cased */
+ /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
+ size_t rv = 0;
+ unsigned siz = sizeof_elt_in_repeated_array(field->type);
+
+ for (i = 0; i < count; i++) {
+ rv += required_field_pack(field, array, out + rv);
+ array = (char *)array + siz;
+ }
+ return rv;
+ }
}
+
static size_t
-unknown_field_pack (const ProtobufCMessageUnknownField *field,
- uint8_t *out)
+unknown_field_pack(const ProtobufCMessageUnknownField *field, uint8_t *out)
{
- size_t rv = tag_pack (field->tag, out);
- out[0] |= field->wire_type;
- memcpy (out + rv, field->data, field->len);
- return rv + field->len;
+ size_t rv = tag_pack(field->tag, out);
+ out[0] |= field->wire_type;
+ memcpy(out + rv, field->data, field->len);
+ return rv + field->len;
}
+/**@}*/
+
size_t
-protobuf_c_message_pack (const ProtobufCMessage *message,
- uint8_t *out)
-{
- unsigned i;
- size_t rv = 0;
- ASSERT_IS_MESSAGE (message);
- for (i = 0; i < message->descriptor->n_fields; i++)
- {
- const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
- const void *member = ((const char *) message) + field->offset;
-
- /* it doesn't hurt to compute qmember (a pointer to the quantifier
- field of the structure), but the pointer is only valid if
- the field is one of:
- - a repeated field
- - an optional field that isn't a pointer type
- (meaning: not a message or a string) */
- const void *qmember = ((const char *) message) + field->quantifier_offset;
-
- if (field->label == PROTOBUF_C_LABEL_REQUIRED)
- rv += required_field_pack (field, member, out + rv);
- else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
- /* note that qmember is bogus for strings and messages,
- but it isn't used */
- rv += optional_field_pack (field, qmember, member, out + rv);
- else
- rv += repeated_field_pack (field, * (const size_t *) qmember, member, out + rv);
- }
- for (i = 0; i < message->n_unknown_fields; i++)
- rv += unknown_field_pack (&message->unknown_fields[i], out + rv);
- return rv;
-}
-
-/* === pack_to_buffer() === */
+protobuf_c_message_pack(const ProtobufCMessage *message, uint8_t *out)
+{
+ unsigned i;
+ size_t rv = 0;
+
+ ASSERT_IS_MESSAGE(message);
+ for (i = 0; i < message->descriptor->n_fields; i++) {
+ const ProtobufCFieldDescriptor *field =
+ message->descriptor->fields + i;
+ const void *member = ((const char *) message) + field->offset;
+
+ /*
+ * It doesn't hurt to compute qmember (a pointer to the
+ * quantifier field of the structure), but the pointer is only
+ * valid if the field is:
+ * - a repeated field, or
+ * - an optional field that isn't a pointer type
+ * (Meaning: not a message or a string).
+ */
+ const void *qmember =
+ ((const char *) message) + field->quantifier_offset;
+
+ if (field->label == PROTOBUF_C_LABEL_REQUIRED) {
+ rv += required_field_pack(field, member, out + rv);
+ } else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
+ /*
+ * Note that qmember is bogus for strings and messages,
+ * but it isn't used.
+ */
+ rv += optional_field_pack(field, qmember, member, out + rv);
+ } else {
+ rv += repeated_field_pack(field, *(const size_t *) qmember,
+ member, out + rv);
+ }
+ }
+ for (i = 0; i < message->n_unknown_fields; i++)
+ rv += unknown_field_pack(&message->unknown_fields[i], out + rv);
+ return rv;
+}
+
+/**
+ * \defgroup packbuf protobuf_c_message_pack_to_buffer() implementation
+ *
+ * Routines mainly used by protobuf_c_message_pack_to_buffer().
+ *
+ * \ingroup internal
+ * @{
+ */
+
+/**
+ * Pack a required field to a virtual buffer.
+ *
+ * \param field
+ * Field descriptor.
+ * \param member
+ * The element to be packed.
+ * \param[out] buffer
+ * Virtual buffer to append data to.
+ * \return
+ * Number of bytes packed.
+ */
static size_t
-required_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
- const void *member,
- ProtobufCBuffer *buffer)
-{
- size_t rv;
- uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
- rv = tag_pack (field->id, scratch);
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SINT32:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += sint32_pack (*(const int32_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_INT32:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += int32_pack (*(const uint32_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_ENUM:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += uint32_pack (*(const uint32_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_SINT64:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += sint64_pack (*(const int64_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += uint64_pack (*(const uint64_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
- rv += fixed32_pack (*(const uint32_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
- rv += fixed64_pack (*(const uint64_t *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_BOOL:
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
- rv += boolean_pack (*(const protobuf_c_boolean *) member, scratch + rv);
- buffer->append (buffer, rv, scratch);
- break;
- case PROTOBUF_C_TYPE_STRING:
- {
- const char *str = *(char * const *) member;
- size_t sublen = str ? strlen (str) : 0;
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- rv += uint32_pack (sublen, scratch + rv);
- buffer->append (buffer, rv, scratch);
- buffer->append (buffer, sublen, (const uint8_t *) str);
- rv += sublen;
- break;
- }
-
- case PROTOBUF_C_TYPE_BYTES:
- {
- const ProtobufCBinaryData * bd = ((const ProtobufCBinaryData*) member);
- size_t sublen = bd->len;
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- rv += uint32_pack (sublen, scratch + rv);
- buffer->append (buffer, rv, scratch);
- buffer->append (buffer, sublen, bd->data);
- rv += sublen;
- break;
- }
- /* PROTOBUF_C_TYPE_GROUP, // NOT SUPPORTED */
- case PROTOBUF_C_TYPE_MESSAGE:
- {
- uint8_t simple_buffer_scratch[256];
- size_t sublen;
- ProtobufCBufferSimple simple_buffer
- = PROTOBUF_C_BUFFER_SIMPLE_INIT (simple_buffer_scratch);
- const ProtobufCMessage *msg = *(ProtobufCMessage * const *) member;
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- if (msg == NULL)
- sublen = 0;
- else
- sublen = protobuf_c_message_pack_to_buffer (msg, &simple_buffer.base);
- rv += uint32_pack (sublen, scratch + rv);
- buffer->append (buffer, rv, scratch);
- buffer->append (buffer, sublen, simple_buffer.data);
- rv += sublen;
- PROTOBUF_C_BUFFER_SIMPLE_CLEAR (&simple_buffer);
- break;
- }
- default:
- PROTOBUF_C_ASSERT_NOT_REACHED ();
- }
- return rv;
-}
+required_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
+ const void *member, ProtobufCBuffer *buffer)
+{
+ size_t rv;
+ uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
+
+ rv = tag_pack(field->id, scratch);
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SINT32:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += sint32_pack(*(const int32_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_INT32:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += int32_pack(*(const uint32_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_ENUM:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += uint32_pack(*(const uint32_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_SINT64:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += sint64_pack(*(const int64_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += uint64_pack(*(const uint64_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_32BIT;
+ rv += fixed32_pack(*(const uint32_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_64BIT;
+ rv += fixed64_pack(*(const uint64_t *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_BOOL:
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_VARINT;
+ rv += boolean_pack(*(const protobuf_c_boolean *) member, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ break;
+ case PROTOBUF_C_TYPE_STRING: {
+ const char *str = *(char *const *) member;
+ size_t sublen = str ? strlen(str) : 0;
+
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ rv += uint32_pack(sublen, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ buffer->append(buffer, sublen, (const uint8_t *) str);
+ rv += sublen;
+ break;
+ }
+ case PROTOBUF_C_TYPE_BYTES: {
+ const ProtobufCBinaryData *bd = ((const ProtobufCBinaryData *) member);
+ size_t sublen = bd->len;
+
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ rv += uint32_pack(sublen, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ buffer->append(buffer, sublen, bd->data);
+ rv += sublen;
+ break;
+ }
+ case PROTOBUF_C_TYPE_MESSAGE: {
+ uint8_t simple_buffer_scratch[256];
+ size_t sublen;
+ const ProtobufCMessage *msg = *(ProtobufCMessage * const *) member;
+ ProtobufCBufferSimple simple_buffer =
+ PROTOBUF_C_BUFFER_SIMPLE_INIT(simple_buffer_scratch);
+
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ if (msg == NULL)
+ sublen = 0;
+ else
+ sublen = protobuf_c_message_pack_to_buffer(msg, &simple_buffer.base);
+ rv += uint32_pack(sublen, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ buffer->append(buffer, sublen, simple_buffer.data);
+ rv += sublen;
+ PROTOBUF_C_BUFFER_SIMPLE_CLEAR(&simple_buffer);
+ break;
+ }
+ default:
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ }
+ return rv;
+}
+
+/**
+ * Pack an optional field to a buffer.
+ *
+ * \param field
+ * Field descriptor.
+ * \param has
+ * Whether the field is set.
+ * \param member
+ * The element to be packed.
+ * \param[out] buffer
+ * Virtual buffer to append data to.
+ * \return
+ * Number of bytes serialised to `buffer`.
+ */
static size_t
-optional_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
- const protobuf_c_boolean *has,
- const void *member,
- ProtobufCBuffer *buffer)
-{
- if (field->type == PROTOBUF_C_TYPE_MESSAGE
- || field->type == PROTOBUF_C_TYPE_STRING)
- {
- const void *ptr = * (const void * const *) member;
- if (ptr == NULL
- || ptr == field->default_value)
- return 0;
- }
- else
- {
- if (!*has)
- return 0;
- }
- return required_field_pack_to_buffer (field, member, buffer);
-}
-
+optional_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
+ const protobuf_c_boolean *has,
+ const void *member, ProtobufCBuffer *buffer)
+{
+ if (field->type == PROTOBUF_C_TYPE_MESSAGE ||
+ field->type == PROTOBUF_C_TYPE_STRING)
+ {
+ const void *ptr = *(const void *const *) member;
+ if (ptr == NULL || ptr == field->default_value)
+ return 0;
+ } else {
+ if (!*has)
+ return 0;
+ }
+ return required_field_pack_to_buffer(field, member, buffer);
+}
+
+/**
+ * Get the packed size of an array of same field type.
+ *
+ * \param field
+ * Field descriptor.
+ * \param count
+ * Number of elements of this type.
+ * \param array
+ * The elements to get the size of.
+ * \return
+ * Number of bytes required.
+ */
static size_t
-get_packed_payload_length (const ProtobufCFieldDescriptor *field,
- unsigned count,
- const void *array)
-{
- unsigned rv = 0;
- unsigned i;
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- return count * 4;
-
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- return count * 8;
-
- case PROTOBUF_C_TYPE_INT32:
- {
- const int32_t *arr = (const int32_t *) array;
- for (i = 0; i < count; i++)
- rv += int32_size (arr[i]);
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT32:
- {
- const int32_t *arr = (const int32_t *) array;
- for (i = 0; i < count; i++)
- rv += sint32_size (arr[i]);
- }
- break;
- case PROTOBUF_C_TYPE_ENUM:
- case PROTOBUF_C_TYPE_UINT32:
- {
- const uint32_t *arr = (const uint32_t *) array;
- for (i = 0; i < count; i++)
- rv += uint32_size (arr[i]);
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT64:
- {
- const int64_t *arr = (const int64_t *) array;
- for (i = 0; i < count; i++)
- rv += sint64_size (arr[i]);
- }
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- {
- const uint64_t *arr = (const uint64_t *) array;
- for (i = 0; i < count; i++)
- rv += uint64_size (arr[i]);
- }
- break;
- case PROTOBUF_C_TYPE_BOOL:
- return count;
- default:
- assert (0);
- }
- return rv;
-}
+get_packed_payload_length(const ProtobufCFieldDescriptor *field,
+ unsigned count, const void *array)
+{
+ unsigned rv = 0;
+ unsigned i;
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ return count * 4;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ return count * 8;
+ case PROTOBUF_C_TYPE_INT32: {
+ const int32_t *arr = (const int32_t *) array;
+ for (i = 0; i < count; i++)
+ rv += int32_size(arr[i]);
+ break;
+ }
+ case PROTOBUF_C_TYPE_SINT32: {
+ const int32_t *arr = (const int32_t *) array;
+ for (i = 0; i < count; i++)
+ rv += sint32_size(arr[i]);
+ break;
+ }
+ case PROTOBUF_C_TYPE_ENUM:
+ case PROTOBUF_C_TYPE_UINT32: {
+ const uint32_t *arr = (const uint32_t *) array;
+ for (i = 0; i < count; i++)
+ rv += uint32_size(arr[i]);
+ break;
+ }
+ case PROTOBUF_C_TYPE_SINT64: {
+ const int64_t *arr = (const int64_t *) array;
+ for (i = 0; i < count; i++)
+ rv += sint64_size(arr[i]);
+ break;
+ }
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64: {
+ const uint64_t *arr = (const uint64_t *) array;
+ for (i = 0; i < count; i++)
+ rv += uint64_size(arr[i]);
+ break;
+ }
+ case PROTOBUF_C_TYPE_BOOL:
+ return count;
+ default:
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ }
+ return rv;
+}
+
+/**
+ * Pack an array of same field type to a virtual buffer.
+ *
+ * \param field
+ * Field descriptor.
+ * \param count
+ * Number of elements of this type.
+ * \param array
+ * The elements to get the size of.
+ * \param[out] buffer
+ * Virtual buffer to append data to.
+ * \return
+ * Number of bytes packed.
+ */
static size_t
-pack_buffer_packed_payload (const ProtobufCFieldDescriptor *field,
- unsigned count,
- const void *array,
- ProtobufCBuffer *buffer)
-{
- uint8_t scratch[16];
- size_t rv = 0;
- unsigned i;
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
-#if IS_LITTLE_ENDIAN
- rv = count * 4;
- goto no_packing_needed;
+pack_buffer_packed_payload(const ProtobufCFieldDescriptor *field,
+ unsigned count, const void *array,
+ ProtobufCBuffer *buffer)
+{
+ uint8_t scratch[16];
+ size_t rv = 0;
+ unsigned i;
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+#if !defined(WORDS_BIGENDIAN)
+ rv = count * 4;
+ goto no_packing_needed;
#else
- for (i = 0; i < count; i++)
- {
- unsigned len = fixed32_pack (((uint32_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
+ for (i = 0; i < count; i++) {
+ unsigned len = fixed32_pack(((uint32_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
#endif
- break;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
-#if IS_LITTLE_ENDIAN
- rv = count * 8;
- goto no_packing_needed;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+#if !defined(WORDS_BIGENDIAN)
+ rv = count * 8;
+ goto no_packing_needed;
#else
- for (i = 0; i < count; i++)
- {
- unsigned len = fixed64_pack (((uint64_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
+ for (i = 0; i < count; i++) {
+ unsigned len = fixed64_pack(((uint64_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
#endif
- case PROTOBUF_C_TYPE_INT32:
- for (i = 0; i < count; i++)
- {
- unsigned len = int32_pack (((int32_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT32:
- for (i = 0; i < count; i++)
- {
- unsigned len = sint32_pack (((int32_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
- case PROTOBUF_C_TYPE_ENUM:
- case PROTOBUF_C_TYPE_UINT32:
- for (i = 0; i < count; i++)
- {
- unsigned len = uint32_pack (((uint32_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT64:
- for (i = 0; i < count; i++)
- {
- unsigned len = sint64_pack (((int64_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- for (i = 0; i < count; i++)
- {
- unsigned len = uint64_pack (((uint64_t*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- break;
- case PROTOBUF_C_TYPE_BOOL:
- for (i = 0; i < count; i++)
- {
- unsigned len = boolean_pack (((protobuf_c_boolean*)array)[i], scratch);
- buffer->append (buffer, len, scratch);
- rv += len;
- }
- return count;
- default:
- assert(0);
- }
- return rv;
-
-#if IS_LITTLE_ENDIAN
+ case PROTOBUF_C_TYPE_INT32:
+ for (i = 0; i < count; i++) {
+ unsigned len = int32_pack(((int32_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_SINT32:
+ for (i = 0; i < count; i++) {
+ unsigned len = sint32_pack(((int32_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_ENUM:
+ case PROTOBUF_C_TYPE_UINT32:
+ for (i = 0; i < count; i++) {
+ unsigned len = uint32_pack(((uint32_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_SINT64:
+ for (i = 0; i < count; i++) {
+ unsigned len = sint64_pack(((int64_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ for (i = 0; i < count; i++) {
+ unsigned len = uint64_pack(((uint64_t *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ break;
+ case PROTOBUF_C_TYPE_BOOL:
+ for (i = 0; i < count; i++) {
+ unsigned len = boolean_pack(((protobuf_c_boolean *) array)[i], scratch);
+ buffer->append(buffer, len, scratch);
+ rv += len;
+ }
+ return count;
+ default:
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ }
+ return rv;
+
+#if !defined(WORDS_BIGENDIAN)
no_packing_needed:
- buffer->append (buffer, rv, array);
- return rv;
+ buffer->append(buffer, rv, array);
+ return rv;
#endif
}
static size_t
-repeated_field_pack_to_buffer (const ProtobufCFieldDescriptor *field,
- unsigned count,
- const void *member,
- ProtobufCBuffer *buffer)
-{
- char *array = * (char * const *) member;
- if (count == 0)
- return 0;
- if (field->packed)
- {
- uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
- size_t rv = tag_pack (field->id, scratch);
- size_t payload_len = get_packed_payload_length (field, count, array);
- size_t tmp;
- scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
- rv += uint32_pack (payload_len, scratch + rv);
- buffer->append (buffer, rv, scratch);
- tmp = pack_buffer_packed_payload (field, count, array, buffer);
- assert (tmp == payload_len);
- return rv + payload_len;
- }
- else
- {
- size_t siz;
- unsigned i;
- /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
- unsigned rv = 0;
- siz = sizeof_elt_in_repeated_array (field->type);
- for (i = 0; i < count; i++)
- {
- rv += required_field_pack_to_buffer (field, array, buffer);
- array += siz;
- }
- return rv;
- }
+repeated_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
+ unsigned count, const void *member,
+ ProtobufCBuffer *buffer)
+{
+ char *array = *(char * const *) member;
+
+ if (count == 0)
+ return 0;
+ if (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED)) {
+ uint8_t scratch[MAX_UINT64_ENCODED_SIZE * 2];
+ size_t rv = tag_pack(field->id, scratch);
+ size_t payload_len = get_packed_payload_length(field, count, array);
+ size_t tmp;
+
+ scratch[0] |= PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED;
+ rv += uint32_pack(payload_len, scratch + rv);
+ buffer->append(buffer, rv, scratch);
+ tmp = pack_buffer_packed_payload(field, count, array, buffer);
+ assert(tmp == payload_len);
+ return rv + payload_len;
+ } else {
+ size_t siz;
+ unsigned i;
+ /* CONSIDER: optimize this case a bit (by putting the loop inside the switch) */
+ unsigned rv = 0;
+
+ siz = sizeof_elt_in_repeated_array(field->type);
+ for (i = 0; i < count; i++) {
+ rv += required_field_pack_to_buffer(field, array, buffer);
+ array = ((char*)array) + siz;
+ }
+ return rv;
+ }
}
static size_t
-unknown_field_pack_to_buffer (const ProtobufCMessageUnknownField *field,
- ProtobufCBuffer *buffer)
+unknown_field_pack_to_buffer(const ProtobufCMessageUnknownField *field,
+ ProtobufCBuffer *buffer)
{
- uint8_t header[MAX_UINT64_ENCODED_SIZE];
- size_t rv = tag_pack (field->tag, header);
- header[0] |= field->wire_type;
- buffer->append (buffer, rv, header);
- buffer->append (buffer, field->len, field->data);
- return rv + field->len;
+ uint8_t header[MAX_UINT64_ENCODED_SIZE];
+ size_t rv = tag_pack(field->tag, header);
+
+ header[0] |= field->wire_type;
+ buffer->append(buffer, rv, header);
+ buffer->append(buffer, field->len, field->data);
+ return rv + field->len;
}
+/**@}*/
+
size_t
-protobuf_c_message_pack_to_buffer (const ProtobufCMessage *message,
- ProtobufCBuffer *buffer)
-{
- unsigned i;
- size_t rv = 0;
- ASSERT_IS_MESSAGE (message);
- for (i = 0; i < message->descriptor->n_fields; i++)
- {
- const ProtobufCFieldDescriptor *field = message->descriptor->fields + i;
- const void *member = ((const char *) message) + field->offset;
- const void *qmember = ((const char *) message) + field->quantifier_offset;
-
- if (field->label == PROTOBUF_C_LABEL_REQUIRED)
- rv += required_field_pack_to_buffer (field, member, buffer);
- else if (field->label == PROTOBUF_C_LABEL_OPTIONAL)
- rv += optional_field_pack_to_buffer (field, qmember, member, buffer);
- else
- rv += repeated_field_pack_to_buffer (field, * (const size_t *) qmember, member, buffer);
- }
- for (i = 0; i < message->n_unknown_fields; i++)
- rv += unknown_field_pack_to_buffer (&message->unknown_fields[i], buffer);
-
- return rv;
-}
-
-/* === unpacking === */
-#if PRINT_UNPACK_ERRORS
-# define UNPACK_ERROR(args) do { printf args;printf("\n"); }while(0)
-#else
-# define UNPACK_ERROR(args) do { } while (0)
-#endif
+protobuf_c_message_pack_to_buffer(const ProtobufCMessage *message,
+ ProtobufCBuffer *buffer)
+{
+ unsigned i;
+ size_t rv = 0;
+
+ ASSERT_IS_MESSAGE(message);
+ for (i = 0; i < message->descriptor->n_fields; i++) {
+ const ProtobufCFieldDescriptor *field =
+ message->descriptor->fields + i;
+ const void *member =
+ ((const char *) message) + field->offset;
+ const void *qmember =
+ ((const char *) message) + field->quantifier_offset;
+
+ if (field->label == PROTOBUF_C_LABEL_REQUIRED) {
+ rv += required_field_pack_to_buffer(field, member, buffer);
+ } else if (field->label == PROTOBUF_C_LABEL_OPTIONAL) {
+ rv += optional_field_pack_to_buffer(
+ field,
+ qmember,
+ member,
+ buffer
+ );
+ } else {
+ rv += repeated_field_pack_to_buffer(
+ field,
+ *(const size_t *) qmember,
+ member,
+ buffer
+ );
+ }
+ }
+ for (i = 0; i < message->n_unknown_fields; i++)
+ rv += unknown_field_pack_to_buffer(&message->unknown_fields[i], buffer);
+
+ return rv;
+}
+
+/**
+ * \defgroup unpack unpacking implementation
+ *
+ * Routines mainly used by the unpacking functions.
+ *
+ * \ingroup internal
+ * @{
+ */
static inline int
-int_range_lookup (unsigned n_ranges,
- const ProtobufCIntRange *ranges,
- int value)
-{
- unsigned start, n;
- if (n_ranges == 0)
- return -1;
- start = 0;
- n = n_ranges;
- while (n > 1)
- {
- unsigned mid = start + n / 2;
- if (value < ranges[mid].start_value)
- {
- n = mid - start;
- }
- else if (value >= ranges[mid].start_value + (int)(ranges[mid+1].orig_index-ranges[mid].orig_index))
- {
- unsigned new_start = mid + 1;
- n = start + n - new_start;
- start = new_start;
- }
- else
- return (value - ranges[mid].start_value) + ranges[mid].orig_index;
- }
- if (n > 0)
- {
- unsigned start_orig_index = ranges[start].orig_index;
- unsigned range_size = ranges[start+1].orig_index - start_orig_index;
-
- if (ranges[start].start_value <= value
- && value < (int)(ranges[start].start_value + range_size))
- return (value - ranges[start].start_value) + start_orig_index;
- }
- return -1;
+int_range_lookup(unsigned n_ranges, const ProtobufCIntRange *ranges, int value)
+{
+ unsigned n;
+ unsigned start;
+
+ if (n_ranges == 0)
+ return -1;
+ start = 0;
+ n = n_ranges;
+ while (n > 1) {
+ unsigned mid = start + n / 2;
+
+ if (value < ranges[mid].start_value) {
+ n = mid - start;
+ } else if (value >= ranges[mid].start_value +
+ (int) (ranges[mid + 1].orig_index -
+ ranges[mid].orig_index))
+ {
+ unsigned new_start = mid + 1;
+ n = start + n - new_start;
+ start = new_start;
+ } else
+ return (value - ranges[mid].start_value) +
+ ranges[mid].orig_index;
+ }
+ if (n > 0) {
+ unsigned start_orig_index = ranges[start].orig_index;
+ unsigned range_size =
+ ranges[start + 1].orig_index - start_orig_index;
+
+ if (ranges[start].start_value <= value &&
+ value < (int) (ranges[start].start_value + range_size))
+ {
+ return (value - ranges[start].start_value) +
+ start_orig_index;
+ }
+ }
+ return -1;
}
static size_t
-parse_tag_and_wiretype (size_t len,
- const uint8_t *data,
- uint32_t *tag_out,
- ProtobufCWireType *wiretype_out)
-{
- unsigned max_rv = len > 5 ? 5 : len;
- uint32_t tag = (data[0]&0x7f) >> 3;
- unsigned shift = 4;
- unsigned rv;
- *wiretype_out = data[0] & 7;
- if ((data[0] & 0x80) == 0)
- {
- *tag_out = tag;
- return 1;
- }
- for (rv = 1; rv < max_rv; rv++)
- if (data[rv] & 0x80)
- {
- tag |= (data[rv] & 0x7f) << shift;
- shift += 7;
- }
- else
- {
- tag |= data[rv] << shift;
- *tag_out = tag;
- return rv + 1;
- }
- return 0; /* error: bad header */
+parse_tag_and_wiretype(size_t len,
+ const uint8_t *data,
+ uint32_t *tag_out,
+ ProtobufCWireType *wiretype_out)
+{
+ unsigned max_rv = len > 5 ? 5 : len;
+ uint32_t tag = (data[0] & 0x7f) >> 3;
+ unsigned shift = 4;
+ unsigned rv;
+
+ *wiretype_out = data[0] & 7;
+ if ((data[0] & 0x80) == 0) {
+ *tag_out = tag;
+ return 1;
+ }
+ for (rv = 1; rv < max_rv; rv++) {
+ if (data[rv] & 0x80) {
+ tag |= (data[rv] & 0x7f) << shift;
+ shift += 7;
+ } else {
+ tag |= data[rv] << shift;
+ *tag_out = tag;
+ return rv + 1;
+ }
+ }
+ return 0; /* error: bad header */
}
/* sizeof(ScannedMember) must be <= (1<<BOUND_SIZEOF_SCANNED_MEMBER_LOG2) */
-#define BOUND_SIZEOF_SCANNED_MEMBER_LOG2 5
+#define BOUND_SIZEOF_SCANNED_MEMBER_LOG2 5
typedef struct _ScannedMember ScannedMember;
-struct _ScannedMember
-{
- uint32_t tag;
- uint8_t wire_type;
- uint8_t length_prefix_len;
- const ProtobufCFieldDescriptor *field;
- size_t len;
- const uint8_t *data;
+/** Field as it's being read. */
+struct _ScannedMember {
+ uint32_t tag; /**< Field tag. */
+ uint8_t wire_type; /**< Field type. */
+ uint8_t length_prefix_len; /**< Prefix length. */
+ const ProtobufCFieldDescriptor *field; /**< Field descriptor. */
+ size_t len; /**< Field length. */
+ const uint8_t *data; /**< Pointer to field data. */
};
static inline uint32_t
-scan_length_prefixed_data (size_t len, const uint8_t *data, size_t *prefix_len_out)
-{
- unsigned hdr_max = len < 5 ? len : 5;
- unsigned hdr_len;
- uint32_t val = 0;
- unsigned i;
- unsigned shift = 0;
- for (i = 0; i < hdr_max; i++)
- {
- val |= (data[i] & 0x7f) << shift;
- shift += 7;
- if ((data[i] & 0x80) == 0)
- break;
- }
- if (i == hdr_max)
- {
- UNPACK_ERROR (("error parsing length for length-prefixed data"));
- return 0;
- }
- hdr_len = i + 1;
- *prefix_len_out = hdr_len;
- if (hdr_len + val > len)
- {
- UNPACK_ERROR (("data too short after length-prefix of %u",
- val));
- return 0;
- }
- return hdr_len + val;
-}
-
-static size_t
-max_b128_numbers (size_t len, const uint8_t *data)
-{
- size_t rv = 0;
- while (len--)
- if ((*data++ & 0x80) == 0)
- ++rv;
- return rv;
-}
-
-
-/* Given a raw slab of packed-repeated values,
- determine the number of elements.
- This function detects certain kinds of errors
- but not others; the remaining error checking is done by
- parse_packed_repeated_member() */
+scan_length_prefixed_data(size_t len, const uint8_t *data,
+ size_t *prefix_len_out)
+{
+ unsigned hdr_max = len < 5 ? len : 5;
+ unsigned hdr_len;
+ uint32_t val = 0;
+ unsigned i;
+ unsigned shift = 0;
+
+ for (i = 0; i < hdr_max; i++) {
+ val |= (data[i] & 0x7f) << shift;
+ shift += 7;
+ if ((data[i] & 0x80) == 0)
+ break;
+ }
+ if (i == hdr_max) {
+ PROTOBUF_C_UNPACK_ERROR("error parsing length for length-prefixed data");
+ return 0;
+ }
+ hdr_len = i + 1;
+ *prefix_len_out = hdr_len;
+ if (hdr_len + val > len) {
+ PROTOBUF_C_UNPACK_ERROR("data too short after length-prefix of %u", val);
+ return 0;
+ }
+ return hdr_len + val;
+}
+
+static size_t
+max_b128_numbers(size_t len, const uint8_t *data)
+{
+ size_t rv = 0;
+ while (len--)
+ if ((*data++ & 0x80) == 0)
+ ++rv;
+ return rv;
+}
+
+/**@}*/
+
+/**
+ * Merge earlier message into a latter message.
+ *
+ * For numeric types and strings, if the same value appears multiple
+ * times, the parser accepts the last value it sees. For embedded
+ * message fields, the parser merges multiple instances of the same
+ * field. That is, all singular scalar fields in the latter instance
+ * replace those in the former, singular embedded messages are merged,
+ * and repeated fields are concatenated.
+ *
+ * The earlier message should be freed after calling this function, as
+ * some of its fields may have been reused and changed to their default
+ * values during the merge.
+ */
+static protobuf_c_boolean
+merge_messages(ProtobufCMessage *earlier_msg,
+ ProtobufCMessage *latter_msg,
+ ProtobufCAllocator *allocator)
+{
+ unsigned i;
+ const ProtobufCFieldDescriptor *fields =
+ earlier_msg->descriptor->fields;
+ for (i = 0; i < latter_msg->descriptor->n_fields; i++) {
+ if (fields[i].label == PROTOBUF_C_LABEL_REPEATED) {
+ size_t *n_earlier =
+ STRUCT_MEMBER_PTR(size_t, earlier_msg,
+ fields[i].quantifier_offset);
+ uint8_t **p_earlier =
+ STRUCT_MEMBER_PTR(uint8_t *, earlier_msg,
+ fields[i].offset);
+ size_t *n_latter =
+ STRUCT_MEMBER_PTR(size_t, latter_msg,
+ fields[i].quantifier_offset);
+ uint8_t **p_latter =
+ STRUCT_MEMBER_PTR(uint8_t *, latter_msg,
+ fields[i].offset);
+
+ if (*n_earlier > 0) {
+ if (*n_latter > 0) {
+ /* Concatenate the repeated field */
+ size_t el_size =
+ sizeof_elt_in_repeated_array(fields[i].type);
+ uint8_t *new_field;
+
+ new_field = do_alloc(allocator,
+ (*n_earlier + *n_latter) * el_size);
+ if (!new_field)
+ return FALSE;
+
+ memcpy(new_field, *p_earlier,
+ *n_earlier * el_size);
+ memcpy(new_field +
+ *n_earlier * el_size,
+ *p_latter,
+ *n_latter * el_size);
+
+ do_free(allocator, *p_latter);
+ do_free(allocator, *p_earlier);
+ *p_latter = new_field;
+ *n_latter = *n_earlier + *n_latter;
+ } else {
+ /* Zero copy the repeated field from the earlier message */
+ *n_latter = *n_earlier;
+ *p_latter = *p_earlier;
+ }
+ /* Make sure the field does not get double freed */
+ *n_earlier = 0;
+ *p_earlier = 0;
+ }
+ } else if (fields[i].type == PROTOBUF_C_TYPE_MESSAGE) {
+ ProtobufCMessage **em =
+ STRUCT_MEMBER_PTR(ProtobufCMessage *,
+ earlier_msg,
+ fields[i].offset);
+ ProtobufCMessage **lm =
+ STRUCT_MEMBER_PTR(ProtobufCMessage *,
+ latter_msg,
+ fields[i].offset);
+ if (*em != NULL) {
+ if (*lm != NULL) {
+ if (!merge_messages
+ (*em, *lm, allocator))
+ return FALSE;
+ } else {
+ /* Zero copy the optional message */
+ assert(fields[i].label ==
+ PROTOBUF_C_LABEL_OPTIONAL);
+ *lm = *em;
+ *em = NULL;
+ }
+ }
+ } else if (fields[i].label == PROTOBUF_C_LABEL_OPTIONAL) {
+ size_t el_size = 0;
+ protobuf_c_boolean need_to_merge = FALSE;
+ void *earlier_elem =
+ STRUCT_MEMBER_P(earlier_msg, fields[i].offset);
+ void *latter_elem =
+ STRUCT_MEMBER_P(latter_msg, fields[i].offset);
+ const void *def_val = fields[i].default_value;
+
+ switch (fields[i].type) {
+ case PROTOBUF_C_TYPE_BYTES: {
+ uint8_t *e_data =
+ ((ProtobufCBinaryData *) earlier_elem)->data;
+ uint8_t *l_data =
+ ((ProtobufCBinaryData *) latter_elem)->data;
+ const ProtobufCBinaryData *d_bd =
+ (ProtobufCBinaryData *) def_val;
+
+ el_size = sizeof(ProtobufCBinaryData);
+ need_to_merge =
+ (e_data != NULL &&
+ (d_bd != NULL &&
+ e_data != d_bd->data)) &&
+ (l_data == NULL ||
+ (d_bd != NULL &&
+ l_data == d_bd->data));
+ break;
+ }
+ case PROTOBUF_C_TYPE_STRING: {
+ char *e_str = *(char **) earlier_elem;
+ char *l_str = *(char **) latter_elem;
+ const char *d_str = def_val;
+
+ el_size = sizeof(char *);
+ need_to_merge = e_str != d_str && l_str == d_str;
+ break;
+ }
+ default: {
+ el_size = sizeof_elt_in_repeated_array(fields[i].type);
+
+ need_to_merge =
+ STRUCT_MEMBER(protobuf_c_boolean,
+ earlier_msg,
+ fields[i].quantifier_offset) &&
+ !STRUCT_MEMBER(protobuf_c_boolean,
+ latter_msg,
+ fields[i].quantifier_offset);
+ break;
+ }
+ }
+
+ if (need_to_merge) {
+ memcpy(latter_elem, earlier_elem, el_size);
+ /*
+ * Reset the element from the old message to 0
+ * to make sure earlier message deallocation
+ * doesn't corrupt zero-copied data in the new
+ * message, earlier message will be freed after
+ * this function is called anyway
+ */
+ memset(earlier_elem, 0, el_size);
+
+ if (fields[i].quantifier_offset != 0) {
+ /* Set the has field, if applicable */
+ STRUCT_MEMBER(protobuf_c_boolean,
+ latter_msg,
+ fields[i].
+ quantifier_offset) = TRUE;
+ STRUCT_MEMBER(protobuf_c_boolean,
+ earlier_msg,
+ fields[i].
+ quantifier_offset) = FALSE;
+ }
+ }
+ }
+ }
+ return TRUE;
+}
+
+/**
+ * Count packed elements.
+ *
+ * Given a raw slab of packed-repeated values, determine the number of
+ * elements. This function detects certain kinds of errors but not
+ * others; the remaining error checking is done by
+ * parse_packed_repeated_member().
+ */
static protobuf_c_boolean
-count_packed_elements (ProtobufCType type,
- size_t len,
- const uint8_t *data,
- size_t *count_out)
-{
- switch (type)
- {
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- if (len % 4 != 0)
- {
- UNPACK_ERROR (("length must be a multiple of 4 for fixed-length 32-bit types"));
- return FALSE;
- }
- *count_out = len / 4;
- return TRUE;
-
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- if (len % 8 != 0)
- {
- UNPACK_ERROR (("length must be a multiple of 8 for fixed-length 64-bit types"));
- return FALSE;
- }
- *count_out = len / 8;
- return TRUE;
-
- case PROTOBUF_C_TYPE_INT32:
- case PROTOBUF_C_TYPE_SINT32:
- case PROTOBUF_C_TYPE_ENUM:
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_SINT64:
- case PROTOBUF_C_TYPE_UINT64:
- *count_out = max_b128_numbers (len, data);
- return TRUE;
- case PROTOBUF_C_TYPE_BOOL:
- *count_out = len;
- return TRUE;
-
- case PROTOBUF_C_TYPE_STRING:
- case PROTOBUF_C_TYPE_BYTES:
- case PROTOBUF_C_TYPE_MESSAGE:
- default:
- UNPACK_ERROR (("bad protobuf-c type %u for packed-repeated", type));
- return FALSE;
- }
+count_packed_elements(ProtobufCType type,
+ size_t len, const uint8_t *data, size_t *count_out)
+{
+ switch (type) {
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ if (len % 4 != 0) {
+ PROTOBUF_C_UNPACK_ERROR("length must be a multiple of 4 for fixed-length 32-bit types");
+ return FALSE;
+ }
+ *count_out = len / 4;
+ return TRUE;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ if (len % 8 != 0) {
+ PROTOBUF_C_UNPACK_ERROR("length must be a multiple of 8 for fixed-length 64-bit types");
+ return FALSE;
+ }
+ *count_out = len / 8;
+ return TRUE;
+ case PROTOBUF_C_TYPE_INT32:
+ case PROTOBUF_C_TYPE_SINT32:
+ case PROTOBUF_C_TYPE_ENUM:
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_SINT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ *count_out = max_b128_numbers(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_BOOL:
+ *count_out = len;
+ return TRUE;
+ case PROTOBUF_C_TYPE_STRING:
+ case PROTOBUF_C_TYPE_BYTES:
+ case PROTOBUF_C_TYPE_MESSAGE:
+ default:
+ PROTOBUF_C_UNPACK_ERROR("bad protobuf-c type %u for packed-repeated", type);
+ return FALSE;
+ }
}
static inline uint32_t
-parse_uint32 (unsigned len, const uint8_t *data)
-{
- unsigned rv = data[0] & 0x7f;
- if (len > 1)
- {
- rv |= ((data[1] & 0x7f) << 7);
- if (len > 2)
- {
- rv |= ((data[2] & 0x7f) << 14);
- if (len > 3)
- {
- rv |= ((data[3] & 0x7f) << 21);
- if (len > 4)
- rv |= (data[4] << 28);
- }
- }
- }
- return rv;
+parse_uint32(unsigned len, const uint8_t *data)
+{
+ uint32_t rv = data[0] & 0x7f;
+ if (len > 1) {
+ rv |= ((uint32_t) (data[1] & 0x7f) << 7);
+ if (len > 2) {
+ rv |= ((uint32_t) (data[2] & 0x7f) << 14);
+ if (len > 3) {
+ rv |= ((uint32_t) (data[3] & 0x7f) << 21);
+ if (len > 4)
+ rv |= ((uint32_t) (data[4]) << 28);
+ }
+ }
+ }
+ return rv;
}
+
static inline uint32_t
-parse_int32 (unsigned len, const uint8_t *data)
+parse_int32(unsigned len, const uint8_t *data)
{
- return parse_uint32 (len, data);
+ return parse_uint32(len, data);
}
+
static inline int32_t
-unzigzag32 (uint32_t v)
+unzigzag32(uint32_t v)
{
- if (v&1)
- return -(v>>1) - 1;
- else
- return v>>1;
+ if (v & 1)
+ return -(v >> 1) - 1;
+ else
+ return v >> 1;
}
+
static inline uint32_t
-parse_fixed_uint32 (const uint8_t *data)
+parse_fixed_uint32(const uint8_t *data)
{
-#if IS_LITTLE_ENDIAN
- uint32_t t;
- memcpy (&t, data, 4);
- return t;
+#if !defined(WORDS_BIGENDIAN)
+ uint32_t t;
+ memcpy(&t, data, 4);
+ return t;
#else
- return data[0] | (data[1] << 8) | (data[2] << 16) | (data[3] << 24);
+ return data[0] |
+ ((uint32_t) (data[1]) << 8) |
+ ((uint32_t) (data[2]) << 16) |
+ ((uint32_t) (data[3]) << 24);
#endif
}
+
static uint64_t
-parse_uint64 (unsigned len, const uint8_t *data)
-{
- unsigned shift, i;
- uint64_t rv;
- if (len < 5)
- return parse_uint32 (len, data);
- rv = ((data[0] & 0x7f))
- | ((data[1] & 0x7f)<<7)
- | ((data[2] & 0x7f)<<14)
- | ((data[3] & 0x7f)<<21);
- shift = 28;
- for (i = 4; i < len; i++)
- {
- rv |= (((uint64_t)(data[i]&0x7f)) << shift);
- shift += 7;
- }
- return rv;
+parse_uint64(unsigned len, const uint8_t *data)
+{
+ unsigned shift, i;
+ uint64_t rv;
+
+ if (len < 5)
+ return parse_uint32(len, data);
+ rv = ((uint64_t) (data[0] & 0x7f)) |
+ ((uint64_t) (data[1] & 0x7f) << 7) |
+ ((uint64_t) (data[2] & 0x7f) << 14) |
+ ((uint64_t) (data[3] & 0x7f) << 21);
+ shift = 28;
+ for (i = 4; i < len; i++) {
+ rv |= (((uint64_t) (data[i] & 0x7f)) << shift);
+ shift += 7;
+ }
+ return rv;
}
+
static inline int64_t
-unzigzag64 (uint64_t v)
+unzigzag64(uint64_t v)
{
- if (v&1)
- return -(v>>1) - 1;
- else
- return v>>1;
+ if (v & 1)
+ return -(v >> 1) - 1;
+ else
+ return v >> 1;
}
+
static inline uint64_t
-parse_fixed_uint64 (const uint8_t *data)
+parse_fixed_uint64(const uint8_t *data)
{
-#if IS_LITTLE_ENDIAN
- uint64_t t;
- memcpy (&t, data, 8);
- return t;
+#if !defined(WORDS_BIGENDIAN)
+ uint64_t t;
+ memcpy(&t, data, 8);
+ return t;
#else
- return (uint64_t)parse_fixed_uint32 (data)
- | (((uint64_t)parse_fixed_uint32(data+4)) << 32);
+ return (uint64_t) parse_fixed_uint32(data) |
+ (((uint64_t) parse_fixed_uint32(data + 4)) << 32);
#endif
}
+
static protobuf_c_boolean
-parse_boolean (unsigned len, const uint8_t *data)
+parse_boolean(unsigned len, const uint8_t *data)
{
- unsigned i;
- for (i = 0; i < len; i++)
- if (data[i] & 0x7f)
- return 1;
- return 0;
+ unsigned i;
+ for (i = 0; i < len; i++)
+ if (data[i] & 0x7f)
+ return TRUE;
+ return FALSE;
}
+
static protobuf_c_boolean
-parse_required_member (ScannedMember *scanned_member,
- void *member,
- ProtobufCAllocator *allocator,
- protobuf_c_boolean maybe_clear)
-{
- unsigned len = scanned_member->len;
- const uint8_t *data = scanned_member->data;
- ProtobufCWireType wire_type = scanned_member->wire_type;
- switch (scanned_member->field->type)
- {
- case PROTOBUF_C_TYPE_INT32:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(uint32_t*)member = parse_int32 (len, data);
- return 1;
- case PROTOBUF_C_TYPE_UINT32:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(uint32_t*)member = parse_uint32 (len, data);
- return 1;
- case PROTOBUF_C_TYPE_SINT32:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(int32_t*)member = unzigzag32 (parse_uint32 (len, data));
- return 1;
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_32BIT)
- return 0;
- *(uint32_t*)member = parse_fixed_uint32 (data);
- return 1;
-
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(uint64_t*)member = parse_uint64 (len, data);
- return 1;
- case PROTOBUF_C_TYPE_SINT64:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(int64_t*)member = unzigzag64 (parse_uint64 (len, data));
- return 1;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_64BIT)
- return 0;
- *(uint64_t*)member = parse_fixed_uint64 (data);
- return 1;
-
- case PROTOBUF_C_TYPE_BOOL:
- *(protobuf_c_boolean*)member = parse_boolean (len, data);
- return 1;
-
- case PROTOBUF_C_TYPE_ENUM:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
- return 0;
- *(uint32_t*)member = parse_uint32 (len, data);
- return 1;
-
- case PROTOBUF_C_TYPE_STRING:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
- return 0;
- {
- char **pstr = member;
- unsigned pref_len = scanned_member->length_prefix_len;
- if (maybe_clear && *pstr != NULL)
- {
- const char *def = scanned_member->field->default_value;
- if (*pstr != NULL && *pstr != def)
- FREE (allocator, *pstr);
- }
- DO_ALLOC (*pstr, allocator, len - pref_len + 1, return 0);
- memcpy (*pstr, data + pref_len, len - pref_len);
- (*pstr)[len-pref_len] = 0;
- return 1;
- }
- case PROTOBUF_C_TYPE_BYTES:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
- return 0;
- {
- ProtobufCBinaryData *bd = member;
- const ProtobufCBinaryData *def_bd;
- unsigned pref_len = scanned_member->length_prefix_len;
- def_bd = scanned_member->field->default_value;
- if (maybe_clear
- && bd->data != NULL
- && (def_bd == NULL || bd->data != def_bd->data))
- FREE (allocator, bd->data);
- DO_ALLOC (bd->data, allocator, len - pref_len, return 0);
- memcpy (bd->data, data + pref_len, len - pref_len);
- bd->len = len - pref_len;
- return 1;
- }
- /* case PROTOBUF_C_TYPE_GROUP, // NOT SUPPORTED */
- case PROTOBUF_C_TYPE_MESSAGE:
- if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
- return 0;
- {
- ProtobufCMessage **pmessage = member;
- ProtobufCMessage *subm;
- const ProtobufCMessage *def_mess;
- unsigned pref_len = scanned_member->length_prefix_len;
- def_mess = scanned_member->field->default_value;
- if (maybe_clear && *pmessage != NULL && *pmessage != def_mess)
- protobuf_c_message_free_unpacked (*pmessage, allocator);
- subm = protobuf_c_message_unpack (scanned_member->field->descriptor,
- allocator,
- len - pref_len, data + pref_len);
- *pmessage = subm; /* since we freed the message we must clear the field, even if NULL */
- if (subm == NULL)
- return 0;
- return 1;
- }
- }
- return 0;
+parse_required_member(ScannedMember *scanned_member,
+ void *member,
+ ProtobufCAllocator *allocator,
+ protobuf_c_boolean maybe_clear)
+{
+ unsigned len = scanned_member->len;
+ const uint8_t *data = scanned_member->data;
+ ProtobufCWireType wire_type = scanned_member->wire_type;
+
+ switch (scanned_member->field->type) {
+ case PROTOBUF_C_TYPE_INT32:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(uint32_t *) member = parse_int32(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_UINT32:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(uint32_t *) member = parse_uint32(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_SINT32:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(int32_t *) member = unzigzag32(parse_uint32(len, data));
+ return TRUE;
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_32BIT)
+ return FALSE;
+ *(uint32_t *) member = parse_fixed_uint32(data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(uint64_t *) member = parse_uint64(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_SINT64:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(int64_t *) member = unzigzag64(parse_uint64(len, data));
+ return TRUE;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_64BIT)
+ return FALSE;
+ *(uint64_t *) member = parse_fixed_uint64(data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_BOOL:
+ *(protobuf_c_boolean *) member = parse_boolean(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_ENUM:
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_VARINT)
+ return FALSE;
+ *(uint32_t *) member = parse_uint32(len, data);
+ return TRUE;
+ case PROTOBUF_C_TYPE_STRING: {
+ char **pstr = member;
+ unsigned pref_len = scanned_member->length_prefix_len;
+
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
+ return FALSE;
+
+ if (maybe_clear && *pstr != NULL) {
+ const char *def = scanned_member->field->default_value;
+ if (*pstr != NULL && *pstr != def)
+ do_free(allocator, *pstr);
+ }
+ *pstr = do_alloc(allocator, len - pref_len + 1);
+ if (*pstr == NULL)
+ return FALSE;
+ memcpy(*pstr, data + pref_len, len - pref_len);
+ (*pstr)[len - pref_len] = 0;
+ return TRUE;
+ }
+ case PROTOBUF_C_TYPE_BYTES: {
+ ProtobufCBinaryData *bd = member;
+ const ProtobufCBinaryData *def_bd;
+ unsigned pref_len = scanned_member->length_prefix_len;
+
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
+ return FALSE;
+
+ def_bd = scanned_member->field->default_value;
+ if (maybe_clear &&
+ bd->data != NULL &&
+ (def_bd == NULL || bd->data != def_bd->data))
+ {
+ do_free(allocator, bd->data);
+ }
+ if (len - pref_len > 0) {
+ bd->data = do_alloc(allocator, len - pref_len);
+ if (bd->data == NULL)
+ return FALSE;
+ memcpy(bd->data, data + pref_len, len - pref_len);
+ } else {
+ bd->data = NULL;
+ }
+ bd->len = len - pref_len;
+ return TRUE;
+ }
+ case PROTOBUF_C_TYPE_MESSAGE: {
+ ProtobufCMessage **pmessage = member;
+ ProtobufCMessage *subm;
+ const ProtobufCMessage *def_mess;
+ protobuf_c_boolean merge_successful = TRUE;
+ unsigned pref_len = scanned_member->length_prefix_len;
+
+ if (wire_type != PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED)
+ return FALSE;
+
+ def_mess = scanned_member->field->default_value;
+ subm = protobuf_c_message_unpack(scanned_member->field->descriptor,
+ allocator,
+ len - pref_len,
+ data + pref_len);
+
+ if (maybe_clear &&
+ *pmessage != NULL &&
+ *pmessage != def_mess)
+ {
+ if (subm != NULL)
+ merge_successful = merge_messages(*pmessage, subm, allocator);
+ /* Delete the previous message */
+ protobuf_c_message_free_unpacked(*pmessage, allocator);
+ }
+ *pmessage = subm;
+ if (subm == NULL || !merge_successful)
+ return FALSE;
+ return TRUE;
+ }
+ }
+ return FALSE;
}
static protobuf_c_boolean
-parse_optional_member (ScannedMember *scanned_member,
- void *member,
- ProtobufCMessage *message,
- ProtobufCAllocator *allocator)
+parse_optional_member(ScannedMember *scanned_member,
+ void *member,
+ ProtobufCMessage *message,
+ ProtobufCAllocator *allocator)
{
- if (!parse_required_member (scanned_member, member, allocator, TRUE))
- return 0;
- if (scanned_member->field->quantifier_offset != 0)
- STRUCT_MEMBER (protobuf_c_boolean,
- message,
- scanned_member->field->quantifier_offset) = 1;
- return 1;
+ if (!parse_required_member(scanned_member, member, allocator, TRUE))
+ return FALSE;
+ if (scanned_member->field->quantifier_offset != 0)
+ STRUCT_MEMBER(protobuf_c_boolean,
+ message,
+ scanned_member->field->quantifier_offset) = TRUE;
+ return TRUE;
}
static protobuf_c_boolean
-parse_repeated_member (ScannedMember *scanned_member,
- void *member,
- ProtobufCMessage *message,
- ProtobufCAllocator *allocator)
-{
- const ProtobufCFieldDescriptor *field = scanned_member->field;
- size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
- size_t siz = sizeof_elt_in_repeated_array (field->type);
- char *array = *(char**)member;
- if (!parse_required_member (scanned_member,
- array + siz * (*p_n),
- allocator,
- FALSE))
- return 0;
- *p_n += 1;
- return 1;
-}
-
-static unsigned scan_varint (unsigned len, const uint8_t *data)
-{
- unsigned i;
- if (len > 10)
- len = 10;
- for (i = 0; i < len; i++)
- if ((data[i] & 0x80) == 0)
- break;
- if (i == len)
- return 0;
- return i + 1;
+parse_repeated_member(ScannedMember *scanned_member,
+ void *member,
+ ProtobufCMessage *message,
+ ProtobufCAllocator *allocator)
+{
+ const ProtobufCFieldDescriptor *field = scanned_member->field;
+ size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
+ size_t siz = sizeof_elt_in_repeated_array(field->type);
+ char *array = *(char **) member;
+
+ if (!parse_required_member(scanned_member, array + siz * (*p_n),
+ allocator, FALSE))
+ {
+ return FALSE;
+ }
+ *p_n += 1;
+ return TRUE;
+}
+
+static unsigned
+scan_varint(unsigned len, const uint8_t *data)
+{
+ unsigned i;
+ if (len > 10)
+ len = 10;
+ for (i = 0; i < len; i++)
+ if ((data[i] & 0x80) == 0)
+ break;
+ if (i == len)
+ return 0;
+ return i + 1;
}
static protobuf_c_boolean
-parse_packed_repeated_member (ScannedMember *scanned_member,
- void *member,
- ProtobufCMessage *message)
-{
- const ProtobufCFieldDescriptor *field = scanned_member->field;
- size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
- size_t siz = sizeof_elt_in_repeated_array (field->type);
- void *array = *(char**)member + siz * (*p_n);
- const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
- size_t rem = scanned_member->len - scanned_member->length_prefix_len;
- size_t count = 0;
- unsigned i;
- switch (field->type)
- {
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- count = (scanned_member->len - scanned_member->length_prefix_len) / 4;
-#if IS_LITTLE_ENDIAN
- goto no_unpacking_needed;
+parse_packed_repeated_member(ScannedMember *scanned_member,
+ void *member,
+ ProtobufCMessage *message)
+{
+ const ProtobufCFieldDescriptor *field = scanned_member->field;
+ size_t *p_n = STRUCT_MEMBER_PTR(size_t, message, field->quantifier_offset);
+ size_t siz = sizeof_elt_in_repeated_array(field->type);
+ void *array = *(char **) member + siz * (*p_n);
+ const uint8_t *at = scanned_member->data + scanned_member->length_prefix_len;
+ size_t rem = scanned_member->len - scanned_member->length_prefix_len;
+ size_t count = 0;
+ unsigned i;
+
+ switch (field->type) {
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ count = (scanned_member->len - scanned_member->length_prefix_len) / 4;
+#if !defined(WORDS_BIGENDIAN)
+ goto no_unpacking_needed;
#else
- for (i = 0; i < count; i++)
- {
- ((uint32_t*)array)[i] = parse_fixed_uint32 (at);
- at += 4;
- }
+ for (i = 0; i < count; i++) {
+ ((uint32_t *) array)[i] = parse_fixed_uint32(at);
+ at += 4;
+ }
+ break;
#endif
- break;
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- count = (scanned_member->len - scanned_member->length_prefix_len) / 8;
-#if IS_LITTLE_ENDIAN
- goto no_unpacking_needed;
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ count = (scanned_member->len - scanned_member->length_prefix_len) / 8;
+#if !defined(WORDS_BIGENDIAN)
+ goto no_unpacking_needed;
#else
- for (i = 0; i < count; i++)
- {
- ((uint64_t*)array)[i] = parse_fixed_uint64 (at);
- at += 8;
- }
- break;
+ for (i = 0; i < count; i++) {
+ ((uint64_t *) array)[i] = parse_fixed_uint64(at);
+ at += 8;
+ }
+ break;
#endif
- case PROTOBUF_C_TYPE_INT32:
- while (rem > 0)
- {
- unsigned s = scan_varint (rem, at);
- if (s == 0)
- {
- UNPACK_ERROR (("bad packed-repeated int32 value"));
- return FALSE;
- }
- ((int32_t*)array)[count++] = parse_int32 (s, at);
- at += s;
- rem -= s;
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT32:
- while (rem > 0)
- {
- unsigned s = scan_varint (rem, at);
- if (s == 0)
- {
- UNPACK_ERROR (("bad packed-repeated sint32 value"));
- return FALSE;
- }
- ((int32_t*)array)[count++] = unzigzag32 (parse_uint32 (s, at));
- at += s;
- rem -= s;
- }
- break;
- case PROTOBUF_C_TYPE_ENUM:
- case PROTOBUF_C_TYPE_UINT32:
- while (rem > 0)
- {
- unsigned s = scan_varint (rem, at);
- if (s == 0)
- {
- UNPACK_ERROR (("bad packed-repeated enum or uint32 value"));
- return FALSE;
- }
- ((uint32_t*)array)[count++] = parse_uint32 (s, at);
- at += s;
- rem -= s;
- }
- break;
-
- case PROTOBUF_C_TYPE_SINT64:
- while (rem > 0)
- {
- unsigned s = scan_varint (rem, at);
- if (s == 0)
- {
- UNPACK_ERROR (("bad packed-repeated sint64 value"));
- return FALSE;
- }
- ((int64_t*)array)[count++] = unzigzag64 (parse_uint64 (s, at));
- at += s;
- rem -= s;
- }
- break;
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_UINT64:
- while (rem > 0)
- {
- unsigned s = scan_varint (rem, at);
- if (s == 0)
- {
- UNPACK_ERROR (("bad packed-repeated int64/uint64 value"));
- return FALSE;
- }
- ((int64_t*)array)[count++] = parse_uint64 (s, at);
- at += s;
- rem -= s;
- }
- break;
- case PROTOBUF_C_TYPE_BOOL:
- count = rem;
- for (i = 0; i < count; i++)
- {
- if (at[i] > 1)
- {
- UNPACK_ERROR (("bad packed-repeated boolean value"));
- return FALSE;
- }
- ((protobuf_c_boolean*)array)[i] = at[i];
- }
- break;
- default:
- assert(0);
- }
- *p_n += count;
- return TRUE;
-
-#if IS_LITTLE_ENDIAN
+ case PROTOBUF_C_TYPE_INT32:
+ while (rem > 0) {
+ unsigned s = scan_varint(rem, at);
+ if (s == 0) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated int32 value");
+ return FALSE;
+ }
+ ((int32_t *) array)[count++] = parse_int32(s, at);
+ at += s;
+ rem -= s;
+ }
+ break;
+ case PROTOBUF_C_TYPE_SINT32:
+ while (rem > 0) {
+ unsigned s = scan_varint(rem, at);
+ if (s == 0) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated sint32 value");
+ return FALSE;
+ }
+ ((int32_t *) array)[count++] = unzigzag32(parse_uint32(s, at));
+ at += s;
+ rem -= s;
+ }
+ break;
+ case PROTOBUF_C_TYPE_ENUM:
+ case PROTOBUF_C_TYPE_UINT32:
+ while (rem > 0) {
+ unsigned s = scan_varint(rem, at);
+ if (s == 0) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated enum or uint32 value");
+ return FALSE;
+ }
+ ((uint32_t *) array)[count++] = parse_uint32(s, at);
+ at += s;
+ rem -= s;
+ }
+ break;
+
+ case PROTOBUF_C_TYPE_SINT64:
+ while (rem > 0) {
+ unsigned s = scan_varint(rem, at);
+ if (s == 0) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated sint64 value");
+ return FALSE;
+ }
+ ((int64_t *) array)[count++] = unzigzag64(parse_uint64(s, at));
+ at += s;
+ rem -= s;
+ }
+ break;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_UINT64:
+ while (rem > 0) {
+ unsigned s = scan_varint(rem, at);
+ if (s == 0) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated int64/uint64 value");
+ return FALSE;
+ }
+ ((int64_t *) array)[count++] = parse_uint64(s, at);
+ at += s;
+ rem -= s;
+ }
+ break;
+ case PROTOBUF_C_TYPE_BOOL:
+ count = rem;
+ for (i = 0; i < count; i++) {
+ if (at[i] > 1) {
+ PROTOBUF_C_UNPACK_ERROR("bad packed-repeated boolean value");
+ return FALSE;
+ }
+ ((protobuf_c_boolean *) array)[i] = at[i];
+ }
+ break;
+ default:
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ }
+ *p_n += count;
+ return TRUE;
+
+#if !defined(WORDS_BIGENDIAN)
no_unpacking_needed:
- memcpy (array, at, count * siz);
- *p_n += count;
- return TRUE;
+ memcpy(array, at, count * siz);
+ *p_n += count;
+ return TRUE;
#endif
}
static protobuf_c_boolean
-is_packable_type (ProtobufCType type)
+is_packable_type(ProtobufCType type)
{
- return type != PROTOBUF_C_TYPE_STRING
- && type != PROTOBUF_C_TYPE_BYTES
- && type != PROTOBUF_C_TYPE_MESSAGE;
+ return
+ type != PROTOBUF_C_TYPE_STRING &&
+ type != PROTOBUF_C_TYPE_BYTES &&
+ type != PROTOBUF_C_TYPE_MESSAGE;
}
static protobuf_c_boolean
-parse_member (ScannedMember *scanned_member,
- ProtobufCMessage *message,
- ProtobufCAllocator *allocator)
-{
- const ProtobufCFieldDescriptor *field = scanned_member->field;
- void *member;
- if (field == NULL)
- {
- ProtobufCMessageUnknownField *ufield = message->unknown_fields + (message->n_unknown_fields++);
- ufield->tag = scanned_member->tag;
- ufield->wire_type = scanned_member->wire_type;
- ufield->len = scanned_member->len;
- DO_UNALIGNED_ALLOC (ufield->data, allocator, scanned_member->len, return 0);
- if (ufield->data == NULL)
- return 0;
- memcpy (ufield->data, scanned_member->data, ufield->len);
- return 1;
- }
- member = (char*)message + field->offset;
- switch (field->label)
- {
- case PROTOBUF_C_LABEL_REQUIRED:
- return parse_required_member (scanned_member, member, allocator, TRUE);
- case PROTOBUF_C_LABEL_OPTIONAL:
- return parse_optional_member (scanned_member, member, message, allocator);
- case PROTOBUF_C_LABEL_REPEATED:
- if (scanned_member->wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED
- && (field->packed || is_packable_type (field->type)))
- return parse_packed_repeated_member (scanned_member, member, message);
- else
- return parse_repeated_member (scanned_member, member, message, allocator);
- }
- PROTOBUF_C_ASSERT_NOT_REACHED ();
- return 0;
-}
-
-void
-protobuf_c_message_init_generic (const ProtobufCMessageDescriptor *desc,
- ProtobufCMessage *message);
+parse_member(ScannedMember *scanned_member,
+ ProtobufCMessage *message,
+ ProtobufCAllocator *allocator)
+{
+ const ProtobufCFieldDescriptor *field = scanned_member->field;
+ void *member;
+
+ if (field == NULL) {
+ ProtobufCMessageUnknownField *ufield =
+ message->unknown_fields +
+ (message->n_unknown_fields++);
+ ufield->tag = scanned_member->tag;
+ ufield->wire_type = scanned_member->wire_type;
+ ufield->len = scanned_member->len;
+ ufield->data = do_alloc(allocator, scanned_member->len);
+ if (ufield->data == NULL)
+ return FALSE;
+ memcpy(ufield->data, scanned_member->data, ufield->len);
+ return TRUE;
+ }
+ member = (char *) message + field->offset;
+ switch (field->label) {
+ case PROTOBUF_C_LABEL_REQUIRED:
+ return parse_required_member(scanned_member, member,
+ allocator, TRUE);
+ case PROTOBUF_C_LABEL_OPTIONAL:
+ return parse_optional_member(scanned_member, member,
+ message, allocator);
+ case PROTOBUF_C_LABEL_REPEATED:
+ if (scanned_member->wire_type ==
+ PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED &&
+ (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED) ||
+ is_packable_type(field->type)))
+ {
+ return parse_packed_repeated_member(scanned_member,
+ member, message);
+ } else {
+ return parse_repeated_member(scanned_member,
+ member, message,
+ allocator);
+ }
+ }
+ PROTOBUF_C__ASSERT_NOT_REACHED();
+ return 0;
+}
+
+/**
+ * Initialise messages generated by old code.
+ *
+ * This function is used if desc->message_init == NULL (which occurs
+ * for old code, and which would be useful to support allocating
+ * descriptors dynamically).
+ */
+static void
+message_init_generic(const ProtobufCMessageDescriptor *desc,
+ ProtobufCMessage *message)
+{
+ unsigned i;
+
+ memset(message, 0, desc->sizeof_message);
+ message->descriptor = desc;
+ for (i = 0; i < desc->n_fields; i++) {
+ if (desc->fields[i].default_value != NULL &&
+ desc->fields[i].label != PROTOBUF_C_LABEL_REPEATED)
+ {
+ void *field =
+ STRUCT_MEMBER_P(message, desc->fields[i].offset);
+ const void *dv = desc->fields[i].default_value;
+
+ switch (desc->fields[i].type) {
+ case PROTOBUF_C_TYPE_INT32:
+ case PROTOBUF_C_TYPE_SINT32:
+ case PROTOBUF_C_TYPE_SFIXED32:
+ case PROTOBUF_C_TYPE_UINT32:
+ case PROTOBUF_C_TYPE_FIXED32:
+ case PROTOBUF_C_TYPE_FLOAT:
+ case PROTOBUF_C_TYPE_ENUM:
+ memcpy(field, dv, 4);
+ break;
+ case PROTOBUF_C_TYPE_INT64:
+ case PROTOBUF_C_TYPE_SINT64:
+ case PROTOBUF_C_TYPE_SFIXED64:
+ case PROTOBUF_C_TYPE_UINT64:
+ case PROTOBUF_C_TYPE_FIXED64:
+ case PROTOBUF_C_TYPE_DOUBLE:
+ memcpy(field, dv, 8);
+ break;
+ case PROTOBUF_C_TYPE_BOOL:
+ memcpy(field, dv, sizeof(protobuf_c_boolean));
+ break;
+ case PROTOBUF_C_TYPE_BYTES:
+ memcpy(field, dv, sizeof(ProtobufCBinaryData));
+ break;
+
+ case PROTOBUF_C_TYPE_STRING:
+ case PROTOBUF_C_TYPE_MESSAGE:
+ /*
+ * The next line essentially implements a cast
+ * from const, which is totally unavoidable.
+ */
+ *(const void **) field = dv;
+ break;
+ }
+ }
+ }
+}
+
+/**@}*/
+/*
+ * ScannedMember slabs (an unpacking implementation detail). Before doing real
+ * unpacking, we first scan through the elements to see how many there are (for
+ * repeated fields), and which field to use (for non-repeated fields given
+ * twice).
+ *
+ * In order to avoid allocations for small messages, we keep a stack-allocated
+ * slab of ScannedMembers of size FIRST_SCANNED_MEMBER_SLAB_SIZE (16). After we
+ * fill that up, we allocate each slab twice as large as the previous one.
+ */
+#define FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2 4
-/* TODO: expose/use this function if desc->message_init==NULL
- (which occurs for old code, and may be useful for certain
- programatic techniques for generating descriptors). */
-void
-protobuf_c_message_init_generic (const ProtobufCMessageDescriptor *desc,
- ProtobufCMessage *message)
-{
- unsigned i;
- memset (message, 0, desc->sizeof_message);
- message->descriptor = desc;
- for (i = 0; i < desc->n_fields; i++)
- if (desc->fields[i].default_value != NULL
- && desc->fields[i].label != PROTOBUF_C_LABEL_REPEATED)
- {
- void *field = STRUCT_MEMBER_P (message, desc->fields[i].offset);
- const void *dv = desc->fields[i].default_value;
- switch (desc->fields[i].type)
- {
- case PROTOBUF_C_TYPE_INT32:
- case PROTOBUF_C_TYPE_SINT32:
- case PROTOBUF_C_TYPE_SFIXED32:
- case PROTOBUF_C_TYPE_UINT32:
- case PROTOBUF_C_TYPE_FIXED32:
- case PROTOBUF_C_TYPE_FLOAT:
- case PROTOBUF_C_TYPE_ENUM:
- memcpy (field, dv, 4);
- break;
-
- case PROTOBUF_C_TYPE_INT64:
- case PROTOBUF_C_TYPE_SINT64:
- case PROTOBUF_C_TYPE_SFIXED64:
- case PROTOBUF_C_TYPE_UINT64:
- case PROTOBUF_C_TYPE_FIXED64:
- case PROTOBUF_C_TYPE_DOUBLE:
- memcpy (field, dv, 8);
- break;
-
- case PROTOBUF_C_TYPE_BOOL:
- memcpy (field, dv, sizeof (protobuf_c_boolean));
- break;
-
- case PROTOBUF_C_TYPE_BYTES:
- memcpy (field, dv, sizeof (ProtobufCBinaryData));
- break;
-
- case PROTOBUF_C_TYPE_STRING:
- case PROTOBUF_C_TYPE_MESSAGE:
- /* the next line essentially implements a cast from const,
- which is totally unavoidable. */
- *(const void**)field = dv;
- break;
- }
- }
-}
-
-/* ScannedMember slabs (an unpacking implementation detail).
- Before doing real unpacking, we first scan through the
- elements to see how many there are (for repeated fields),
- and which field to use (for non-repeated fields given twice).
-
- * In order to avoid allocations for small messages,
- we keep a stack-allocated slab of ScannedMembers of
- size FIRST_SCANNED_MEMBER_SLAB_SIZE (16).
- After we fill that up, we allocate each slab twice
- as large as the previous one. */
-#define FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2 4
-
-/* The number of slabs, including the stack-allocated ones;
- choose the number so that we would overflow if we needed
- a slab larger than provided. */
-#define MAX_SCANNED_MEMBER_SLAB \
- (sizeof(void*)*8 - 1 \
- - BOUND_SIZEOF_SCANNED_MEMBER_LOG2 \
+/*
+ * The number of slabs, including the stack-allocated ones; choose the number so
+ * that we would overflow if we needed a slab larger than provided.
+ */
+#define MAX_SCANNED_MEMBER_SLAB \
+ (sizeof(unsigned int)*8 - 1 \
+ - BOUND_SIZEOF_SCANNED_MEMBER_LOG2 \
- FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2)
+#define REQUIRED_FIELD_BITMAP_SET(index) \
+ (required_fields_bitmap[(index)/8] |= (1<<((index)%8)))
+
+#define REQUIRED_FIELD_BITMAP_IS_SET(index) \
+ (required_fields_bitmap[(index)/8] & (1<<((index)%8)))
+
ProtobufCMessage *
-protobuf_c_message_unpack (const ProtobufCMessageDescriptor *desc,
- ProtobufCAllocator *allocator,
- size_t len,
- const uint8_t *data)
-{
- ProtobufCMessage *rv;
- size_t rem = len;
- const uint8_t *at = data;
- const ProtobufCFieldDescriptor *last_field = desc->fields + 0;
- ScannedMember first_member_slab[1<<FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2];
-
- /* scanned_member_slabs[i] is an array of arrays of ScannedMember.
- The first slab (scanned_member_slabs[0] is just a pointer to
- first_member_slab), above. All subsequent slabs will be allocated
- using the allocator. */
- ScannedMember *scanned_member_slabs[MAX_SCANNED_MEMBER_SLAB+1];
- unsigned which_slab = 0; /* the slab we are currently populating */
- unsigned in_slab_index = 0; /* number of members in the slab */
- size_t n_unknown = 0;
- unsigned f;
- unsigned i_slab;
- unsigned last_field_index = 0;
- unsigned char required_fields_bitmap[MAX_MEMBERS_FOR_HASH_SIZE/8] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,};
- /*static const unsigned word_bits = sizeof(long) * 8;*/
-
- ASSERT_IS_MESSAGE_DESCRIPTOR (desc);
-
- if (allocator == NULL)
- allocator = &protobuf_c_default_allocator;
-
- /* We treat all fields % (16*8), which should be good enough. */
-#define REQUIRED_FIELD_BITMAP_SET(index) \
- (required_fields_bitmap[(index/8)%sizeof(required_fields_bitmap)] |= (1<<((index)%8)))
-#define REQUIRED_FIELD_BITMAP_IS_SET(index) \
- (required_fields_bitmap[(index/8)%sizeof(required_fields_bitmap)] & (1<<((index)%8)))
-
- DO_ALLOC (rv, allocator, desc->sizeof_message, return NULL);
- scanned_member_slabs[0] = first_member_slab;
-
- /* Generated code always defines "message_init".
- However, we provide a fallback for (1) users of old protobuf-c
- generated-code that do not provide the function,
- and (2) descriptors constructed from some other source
- (most likely, direct construction from the .proto file) */
- if (desc->message_init != NULL)
- protobuf_c_message_init (desc, rv);
- else
- protobuf_c_message_init_generic (desc, rv);
-
- while (rem > 0)
- {
- uint32_t tag;
- ProtobufCWireType wire_type;
- size_t used = parse_tag_and_wiretype (rem, at, &tag, &wire_type);
- const ProtobufCFieldDescriptor *field;
- ScannedMember tmp;
- memset(&tmp, 0, sizeof(ScannedMember));
- if (used == 0)
- {
- UNPACK_ERROR (("error parsing tag/wiretype at offset %u",
- (unsigned)(at-data)));
- goto error_cleanup_during_scan;
- }
- /* XXX: consider optimizing for field[1].id == tag, if field[1] exists! */
- if (last_field == NULL || last_field->id != tag)
- {
- /* lookup field */
- int field_index = int_range_lookup (desc->n_field_ranges,
- desc->field_ranges,
- tag);
- if (field_index < 0)
- {
- field = NULL;
- n_unknown++;
- }
- else
- {
- field = desc->fields + field_index;
- last_field = field;
- last_field_index = field_index;
- }
- }
- else
- field = last_field;
-
- if (field != NULL && field->label == PROTOBUF_C_LABEL_REQUIRED)
- REQUIRED_FIELD_BITMAP_SET (last_field_index);
-
- at += used;
- rem -= used;
- tmp.tag = tag;
- tmp.wire_type = wire_type;
- tmp.field = field;
- tmp.data = at;
- switch (wire_type)
- {
- case PROTOBUF_C_WIRE_TYPE_VARINT:
- {
- unsigned max_len = rem < 10 ? rem : 10;
- unsigned i;
- for (i = 0; i < max_len; i++)
- if ((at[i] & 0x80) == 0)
- break;
- if (i == max_len)
- {
- UNPACK_ERROR (("unterminated varint at offset %u",
- (unsigned)(at-data)));
- goto error_cleanup_during_scan;
- }
- tmp.len = i + 1;
- }
- break;
- case PROTOBUF_C_WIRE_TYPE_64BIT:
- if (rem < 8)
- {
- UNPACK_ERROR (("too short after 64bit wiretype at offset %u",
- (unsigned)(at-data)));
- goto error_cleanup_during_scan;
- }
- tmp.len = 8;
- break;
- case PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED:
- {
- size_t pref_len;
- tmp.len = scan_length_prefixed_data (rem, at, &pref_len);
- if (tmp.len == 0)
- {
- /* NOTE: scan_length_prefixed_data calls UNPACK_ERROR */
- goto error_cleanup_during_scan;
- }
- tmp.length_prefix_len = pref_len;
- break;
- }
- case PROTOBUF_C_WIRE_TYPE_32BIT:
- if (rem < 4)
- {
- UNPACK_ERROR (("too short after 32bit wiretype at offset %u",
- (unsigned)(at-data)));
- goto error_cleanup_during_scan;
- }
- tmp.len = 4;
- break;
- default:
- UNPACK_ERROR (("unsupported tag %u at offset %u",
- wire_type, (unsigned)(at-data)));
- goto error_cleanup_during_scan;
- }
- if (in_slab_index == (1U<<(which_slab+FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2)))
- {
- size_t size;
- in_slab_index = 0;
- if (which_slab == MAX_SCANNED_MEMBER_SLAB)
- {
- UNPACK_ERROR (("too many fields"));
- goto error_cleanup_during_scan;
- }
- which_slab++;
- size = sizeof(ScannedMember) << (which_slab+FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2);
- /* TODO: consider using alloca() ! */
- if (allocator->tmp_alloc != NULL)
- scanned_member_slabs[which_slab] = TMPALLOC(allocator, size);
- else
- DO_ALLOC (scanned_member_slabs[which_slab], allocator, size, goto error_cleanup_during_scan);
- }
- scanned_member_slabs[which_slab][in_slab_index++] = tmp;
-
- if (field != NULL && field->label == PROTOBUF_C_LABEL_REPEATED)
- {
- size_t *n = STRUCT_MEMBER_PTR (size_t, rv, field->quantifier_offset);
- if (wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED
- && (field->packed || is_packable_type (field->type)))
- {
- size_t count;
- if (!count_packed_elements (field->type,
- tmp.len - tmp.length_prefix_len,
- tmp.data + tmp.length_prefix_len,
- &count))
- {
- UNPACK_ERROR (("counting packed elements"));
- goto error_cleanup_during_scan;
- }
- *n += count;
- }
- else
- *n += 1;
- }
-
- at += tmp.len;
- rem -= tmp.len;
- }
-
- /* allocate space for repeated fields, also check that all required fields have been set */
- for (f = 0; f < desc->n_fields; f++)
- {
- const ProtobufCFieldDescriptor *field = desc->fields + f;
- if (field->label == PROTOBUF_C_LABEL_REPEATED)
- {
- size_t siz = sizeof_elt_in_repeated_array (field->type);
- size_t *n_ptr = STRUCT_MEMBER_PTR (size_t, rv, field->quantifier_offset);
- if (*n_ptr != 0)
- {
- unsigned n = *n_ptr;
- *n_ptr = 0;
- assert(rv->descriptor != NULL);
+protobuf_c_message_unpack(const ProtobufCMessageDescriptor *desc,
+ ProtobufCAllocator *allocator,
+ size_t len, const uint8_t *data)
+{
+ ProtobufCMessage *rv;
+ size_t rem = len;
+ const uint8_t *at = data;
+ const ProtobufCFieldDescriptor *last_field = desc->fields + 0;
+ ScannedMember first_member_slab[1 <<
+ FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2];
+
+ /*
+ * scanned_member_slabs[i] is an array of arrays of ScannedMember.
+ * The first slab (scanned_member_slabs[0] is just a pointer to
+ * first_member_slab), above. All subsequent slabs will be allocated
+ * using the allocator.
+ */
+ ScannedMember *scanned_member_slabs[MAX_SCANNED_MEMBER_SLAB + 1];
+ unsigned which_slab = 0; /* the slab we are currently populating */
+ unsigned in_slab_index = 0; /* number of members in the slab */
+ size_t n_unknown = 0;
+ unsigned f;
+ unsigned j;
+ unsigned i_slab;
+ unsigned last_field_index = 0;
+ unsigned required_fields_bitmap_len;
+ unsigned char required_fields_bitmap_stack[16];
+ unsigned char *required_fields_bitmap = required_fields_bitmap_stack;
+ protobuf_c_boolean required_fields_bitmap_alloced = FALSE;
+
+ ASSERT_IS_MESSAGE_DESCRIPTOR(desc);
+
+ if (allocator == NULL)
+ allocator = &protobuf_c__allocator;
+
+ rv = do_alloc(allocator, desc->sizeof_message);
+ if (!rv)
+ return (NULL);
+ scanned_member_slabs[0] = first_member_slab;
+
+ required_fields_bitmap_len = (desc->n_fields + 7) / 8;
+ if (required_fields_bitmap_len > sizeof(required_fields_bitmap_stack)) {
+ required_fields_bitmap = do_alloc(allocator, required_fields_bitmap_len);
+ if (!required_fields_bitmap) {
+ do_free(allocator, rv);
+ return (NULL);
+ }
+ required_fields_bitmap_alloced = TRUE;
+ }
+ memset(required_fields_bitmap, 0, required_fields_bitmap_len);
+
+ /*
+ * Generated code always defines "message_init". However, we provide a
+ * fallback for (1) users of old protobuf-c generated-code that do not
+ * provide the function, and (2) descriptors constructed from some other
+ * source (most likely, direct construction from the .proto file).
+ */
+ if (desc->message_init != NULL)
+ protobuf_c_message_init(desc, rv);
+ else
+ message_init_generic(desc, rv);
+
+ while (rem > 0) {
+ uint32_t tag;
+ ProtobufCWireType wire_type;
+ size_t used = parse_tag_and_wiretype(rem, at, &tag, &wire_type);
+ const ProtobufCFieldDescriptor *field;
+ ScannedMember tmp;
+
+ memset(&tmp, 0, sizeof(ScannedMember));
+
+ if (used == 0) {
+ PROTOBUF_C_UNPACK_ERROR("error parsing tag/wiretype at offset %u",
+ (unsigned) (at - data));
+ goto error_cleanup_during_scan;
+ }
+ /*
+ * \todo Consider optimizing for field[1].id == tag, if field[1]
+ * exists!
+ */
+ if (last_field == NULL || last_field->id != tag) {
+ /* lookup field */
+ int field_index =
+ int_range_lookup(desc->n_field_ranges,
+ desc->field_ranges,
+ tag);
+ if (field_index < 0) {
+ field = NULL;
+ n_unknown++;
+ } else {
+ field = desc->fields + field_index;
+ last_field = field;
+ last_field_index = field_index;
+ }
+ } else {
+ field = last_field;
+ }
+
+ if (field != NULL && field->label == PROTOBUF_C_LABEL_REQUIRED)
+ REQUIRED_FIELD_BITMAP_SET(last_field_index);
+
+ at += used;
+ rem -= used;
+ tmp.tag = tag;
+ tmp.wire_type = wire_type;
+ tmp.field = field;
+ tmp.data = at;
+ tmp.length_prefix_len = 0;
+
+ switch (wire_type) {
+ case PROTOBUF_C_WIRE_TYPE_VARINT: {
+ unsigned max_len = rem < 10 ? rem : 10;
+ unsigned i;
+
+ for (i = 0; i < max_len; i++)
+ if ((at[i] & 0x80) == 0)
+ break;
+ if (i == max_len) {
+ PROTOBUF_C_UNPACK_ERROR("unterminated varint at offset %u",
+ (unsigned) (at - data));
+ goto error_cleanup_during_scan;
+ }
+ tmp.len = i + 1;
+ break;
+ }
+ case PROTOBUF_C_WIRE_TYPE_64BIT:
+ if (rem < 8) {
+ PROTOBUF_C_UNPACK_ERROR("too short after 64bit wiretype at offset %u",
+ (unsigned) (at - data));
+ goto error_cleanup_during_scan;
+ }
+ tmp.len = 8;
+ break;
+ case PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED: {
+ size_t pref_len;
+
+ tmp.len = scan_length_prefixed_data(rem, at, &pref_len);
+ if (tmp.len == 0) {
+ /* NOTE: scan_length_prefixed_data calls UNPACK_ERROR */
+ goto error_cleanup_during_scan;
+ }
+ tmp.length_prefix_len = pref_len;
+ break;
+ }
+ case PROTOBUF_C_WIRE_TYPE_32BIT:
+ if (rem < 4) {
+ PROTOBUF_C_UNPACK_ERROR("too short after 32bit wiretype at offset %u",
+ (unsigned) (at - data));
+ goto error_cleanup_during_scan;
+ }
+ tmp.len = 4;
+ break;
+ default:
+ PROTOBUF_C_UNPACK_ERROR("unsupported tag %u at offset %u",
+ wire_type, (unsigned) (at - data));
+ goto error_cleanup_during_scan;
+ }
+
+ if (in_slab_index == (1U <<
+ (which_slab + FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2)))
+ {
+ size_t size;
+
+ in_slab_index = 0;
+ if (which_slab == MAX_SCANNED_MEMBER_SLAB) {
+ PROTOBUF_C_UNPACK_ERROR("too many fields");
+ goto error_cleanup_during_scan;
+ }
+ which_slab++;
+ size = sizeof(ScannedMember)
+ << (which_slab + FIRST_SCANNED_MEMBER_SLAB_SIZE_LOG2);
+ scanned_member_slabs[which_slab] = do_alloc(allocator, size);
+ if (scanned_member_slabs[which_slab] == NULL)
+ goto error_cleanup_during_scan;
+ }
+ scanned_member_slabs[which_slab][in_slab_index++] = tmp;
+
+ if (field != NULL && field->label == PROTOBUF_C_LABEL_REPEATED) {
+ size_t *n = STRUCT_MEMBER_PTR(size_t, rv,
+ field->quantifier_offset);
+ if (wire_type == PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED &&
+ (0 != (field->flags & PROTOBUF_C_FIELD_FLAG_PACKED) ||
+ is_packable_type(field->type)))
+ {
+ size_t count;
+ if (!count_packed_elements(field->type,
+ tmp.len -
+ tmp.length_prefix_len,
+ tmp.data +
+ tmp.length_prefix_len,
+ &count))
+ {
+ PROTOBUF_C_UNPACK_ERROR("counting packed elements");
+ goto error_cleanup_during_scan;
+ }
+ *n += count;
+ } else {
+ *n += 1;
+ }
+ }
+
+ at += tmp.len;
+ rem -= tmp.len;
+ }
+
+ /* allocate space for repeated fields, also check that all required fields have been set */
+ for (f = 0; f < desc->n_fields; f++) {
+ const ProtobufCFieldDescriptor *field = desc->fields + f;
+ if (field->label == PROTOBUF_C_LABEL_REPEATED) {
+ size_t siz =
+ sizeof_elt_in_repeated_array(field->type);
+ size_t *n_ptr =
+ STRUCT_MEMBER_PTR(size_t, rv,
+ field->quantifier_offset);
+ if (*n_ptr != 0) {
+ unsigned n = *n_ptr;
+ void *a;
+ *n_ptr = 0;
+ assert(rv->descriptor != NULL);
#define CLEAR_REMAINING_N_PTRS() \
for(f++;f < desc->n_fields; f++) \
{ \
@@ -2376,315 +2904,385 @@ protobuf_c_message_unpack (const ProtobufCMessageDescriptor *desc,
if (field->label == PROTOBUF_C_LABEL_REPEATED) \
STRUCT_MEMBER (size_t, rv, field->quantifier_offset) = 0; \
}
- DO_ALLOC (STRUCT_MEMBER (void *, rv, field->offset),
- allocator, siz * n,
- CLEAR_REMAINING_N_PTRS (); goto error_cleanup);
- }
- }
- else if (field->label == PROTOBUF_C_LABEL_REQUIRED)
- {
- if (field->default_value == NULL
- && !REQUIRED_FIELD_BITMAP_IS_SET (f))
- {
- CLEAR_REMAINING_N_PTRS ();
- UNPACK_ERROR (("message '%s': missing required field '%s'", desc->name, field->name));
- goto error_cleanup;
- }
- }
- }
+ a = do_alloc(allocator, siz * n);
+ if (!a) {
+ CLEAR_REMAINING_N_PTRS();
+ goto error_cleanup;
+ }
+ STRUCT_MEMBER(void *, rv, field->offset) = a;
+ }
+ } else if (field->label == PROTOBUF_C_LABEL_REQUIRED) {
+ if (field->default_value == NULL &&
+ !REQUIRED_FIELD_BITMAP_IS_SET(f))
+ {
+ CLEAR_REMAINING_N_PTRS();
+ PROTOBUF_C_UNPACK_ERROR("message '%s': missing required field '%s'",
+ desc->name, field->name);
+ goto error_cleanup;
+ }
+ }
+ }
#undef CLEAR_REMAINING_N_PTRS
- /* allocate space for unknown fields */
- if (n_unknown)
- {
- DO_ALLOC (rv->unknown_fields,
- allocator, n_unknown * sizeof (ProtobufCMessageUnknownField),
- goto error_cleanup);
- }
-
- /* do real parsing */
- for (i_slab = 0; i_slab <= which_slab; i_slab++)
- {
- unsigned max = (i_slab == which_slab) ? in_slab_index : (1U<<(i_slab+4));
- ScannedMember *slab = scanned_member_slabs[i_slab];
- unsigned j;
- for (j = 0; j < max; j++)
- {
- if (!parse_member (slab + j, rv, allocator))
- {
- UNPACK_ERROR (("error parsing member %s of %s",
- slab->field ? slab->field->name : "*unknown-field*", desc->name));
- goto error_cleanup;
- }
- }
- }
-
- /* cleanup */
- if (allocator->tmp_alloc == NULL)
- {
- unsigned j;
- for (j = 1; j <= which_slab; j++)
- FREE (allocator, scanned_member_slabs[j]);
- }
-
- return rv;
+ /* allocate space for unknown fields */
+ if (n_unknown) {
+ rv->unknown_fields = do_alloc(allocator,
+ n_unknown * sizeof(ProtobufCMessageUnknownField));
+ if (rv->unknown_fields == NULL)
+ goto error_cleanup;
+ }
+
+ /* do real parsing */
+ for (i_slab = 0; i_slab <= which_slab; i_slab++) {
+ unsigned max = (i_slab == which_slab) ?
+ in_slab_index : (1U << (i_slab + 4));
+ ScannedMember *slab = scanned_member_slabs[i_slab];
+ unsigned j;
+
+ for (j = 0; j < max; j++) {
+ if (!parse_member(slab + j, rv, allocator)) {
+ PROTOBUF_C_UNPACK_ERROR("error parsing member %s of %s",
+ slab->field ? slab->field->name : "*unknown-field*",
+ desc->name);
+ goto error_cleanup;
+ }
+ }
+ }
+
+ /* cleanup */
+ for (j = 1; j <= which_slab; j++)
+ do_free(allocator, scanned_member_slabs[j]);
+ if (required_fields_bitmap_alloced)
+ do_free(allocator, required_fields_bitmap);
+ return rv;
error_cleanup:
- protobuf_c_message_free_unpacked (rv, allocator);
- if (allocator->tmp_alloc == NULL)
- {
- unsigned j;
- for (j = 1; j <= which_slab; j++)
- FREE (allocator, scanned_member_slabs[j]);
- }
- return NULL;
+ protobuf_c_message_free_unpacked(rv, allocator);
+ for (j = 1; j <= which_slab; j++)
+ do_free(allocator, scanned_member_slabs[j]);
+ if (required_fields_bitmap_alloced)
+ do_free(allocator, required_fields_bitmap);
+ return NULL;
error_cleanup_during_scan:
- FREE (allocator, rv);
- if (allocator->tmp_alloc == NULL)
- {
- unsigned j;
- for (j = 1; j <= which_slab; j++)
- FREE (allocator, scanned_member_slabs[j]);
- }
- return NULL;
-}
-
-/* === free_unpacked === */
-void
-protobuf_c_message_free_unpacked (ProtobufCMessage *message,
- ProtobufCAllocator *allocator)
-{
- const ProtobufCMessageDescriptor *desc = message->descriptor;
- unsigned f;
- ASSERT_IS_MESSAGE (message);
- if (allocator == NULL)
- allocator = &protobuf_c_default_allocator;
- message->descriptor = NULL;
- for (f = 0; f < desc->n_fields; f++)
- {
- if (desc->fields[f].label == PROTOBUF_C_LABEL_REPEATED)
- {
- size_t n = STRUCT_MEMBER (size_t, message, desc->fields[f].quantifier_offset);
- void * arr = STRUCT_MEMBER (void *, message, desc->fields[f].offset);
- if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING)
- {
- unsigned i;
- for (i = 0; i < n; i++)
- FREE (allocator, ((char**)arr)[i]);
- }
- else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES)
- {
- unsigned i;
- for (i = 0; i < n; i++)
- FREE (allocator, ((ProtobufCBinaryData*)arr)[i].data);
- }
- else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE)
- {
- unsigned i;
- for (i = 0; i < n; i++)
- protobuf_c_message_free_unpacked (((ProtobufCMessage**)arr)[i], allocator);
- }
- if (arr != NULL)
- FREE (allocator, arr);
- }
- else if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING)
- {
- char *str = STRUCT_MEMBER (char *, message, desc->fields[f].offset);
- if (str && str != desc->fields[f].default_value)
- FREE (allocator, str);
- }
- else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES)
- {
- void *data = STRUCT_MEMBER (ProtobufCBinaryData, message, desc->fields[f].offset).data;
- const ProtobufCBinaryData *default_bd;
- default_bd = desc->fields[f].default_value;
- if (data != NULL
- && (default_bd == NULL || default_bd->data != data))
- FREE (allocator, data);
- }
- else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE)
- {
- ProtobufCMessage *sm;
- sm = STRUCT_MEMBER (ProtobufCMessage *, message,desc->fields[f].offset);
- if (sm && sm != desc->fields[f].default_value)
- protobuf_c_message_free_unpacked (sm, allocator);
- }
- }
-
- for (f = 0; f < message->n_unknown_fields; f++)
- FREE (allocator, message->unknown_fields[f].data);
- if (message->unknown_fields != NULL)
- FREE (allocator, message->unknown_fields);
-
- FREE (allocator, message);
+ do_free(allocator, rv);
+ for (j = 1; j <= which_slab; j++)
+ do_free(allocator, scanned_member_slabs[j]);
+ if (required_fields_bitmap_alloced)
+ do_free(allocator, required_fields_bitmap);
+ return NULL;
}
void
-protobuf_c_message_init (const ProtobufCMessageDescriptor *descriptor,
- void *message)
-{
- descriptor->message_init((ProtobufCMessage*) (message));
+protobuf_c_message_free_unpacked(ProtobufCMessage *message,
+ ProtobufCAllocator *allocator)
+{
+ const ProtobufCMessageDescriptor *desc = message->descriptor;
+ unsigned f;
+
+ ASSERT_IS_MESSAGE(message);
+ if (allocator == NULL)
+ allocator = &protobuf_c__allocator;
+ message->descriptor = NULL;
+ for (f = 0; f < desc->n_fields; f++) {
+ if (desc->fields[f].label == PROTOBUF_C_LABEL_REPEATED) {
+ size_t n = STRUCT_MEMBER(size_t,
+ message,
+ desc->fields[f].quantifier_offset);
+ void *arr = STRUCT_MEMBER(void *,
+ message,
+ desc->fields[f].offset);
+
+ if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+ do_free(allocator, ((char **) arr)[i]);
+ } else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+ do_free(allocator, ((ProtobufCBinaryData *) arr)[i].data);
+ } else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE) {
+ unsigned i;
+ for (i = 0; i < n; i++)
+ protobuf_c_message_free_unpacked(
+ ((ProtobufCMessage **) arr)[i],
+ allocator
+ );
+ }
+ if (arr != NULL)
+ do_free(allocator, arr);
+ } else if (desc->fields[f].type == PROTOBUF_C_TYPE_STRING) {
+ char *str = STRUCT_MEMBER(char *, message,
+ desc->fields[f].offset);
+
+ if (str && str != desc->fields[f].default_value)
+ do_free(allocator, str);
+ } else if (desc->fields[f].type == PROTOBUF_C_TYPE_BYTES) {
+ void *data = STRUCT_MEMBER(ProtobufCBinaryData, message,
+ desc->fields[f].offset).data;
+ const ProtobufCBinaryData *default_bd;
+
+ default_bd = desc->fields[f].default_value;
+ if (data != NULL &&
+ (default_bd == NULL ||
+ default_bd->data != data))
+ {
+ do_free(allocator, data);
+ }
+ } else if (desc->fields[f].type == PROTOBUF_C_TYPE_MESSAGE) {
+ ProtobufCMessage *sm;
+
+ sm = STRUCT_MEMBER(ProtobufCMessage *, message,
+ desc->fields[f].offset);
+ if (sm && sm != desc->fields[f].default_value)
+ protobuf_c_message_free_unpacked(sm, allocator);
+ }
+ }
+
+ for (f = 0; f < message->n_unknown_fields; f++)
+ do_free(allocator, message->unknown_fields[f].data);
+ if (message->unknown_fields != NULL)
+ do_free(allocator, message->unknown_fields);
+
+ do_free(allocator, message);
}
-/* === services === */
-typedef void (*GenericHandler)(void *service,
- const ProtobufCMessage *input,
- ProtobufCClosure closure,
- void *closure_data);
-void
-protobuf_c_service_invoke_internal(ProtobufCService *service,
- unsigned method_index,
- const ProtobufCMessage *input,
- ProtobufCClosure closure,
- void *closure_data)
-{
- GenericHandler *handlers;
- GenericHandler handler;
-
- /* Verify that method_index is within range.
- If this fails, you are likely invoking a newly added
- method on an old service. (Although other memory corruption
- bugs can cause this assertion too) */
- PROTOBUF_C_ASSERT (method_index < service->descriptor->n_methods);
+void
+protobuf_c_message_init(const ProtobufCMessageDescriptor * descriptor,
+ void *message)
+{
+ descriptor->message_init((ProtobufCMessage *) (message));
+}
+
+protobuf_c_boolean
+protobuf_c_message_check(const ProtobufCMessage *message)
+{
+ unsigned i;
+
+ if (!message ||
+ !message->descriptor ||
+ message->descriptor->magic != PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC)
+ {
+ return FALSE;
+ }
+
+ for (i = 0; i < message->descriptor->n_fields; i++) {
+ const ProtobufCFieldDescriptor *f = message->descriptor->fields + i;
+ ProtobufCType type = f->type;
+ ProtobufCLabel label = f->label;
+ void *field = STRUCT_MEMBER_P (message, f->offset);
+
+ if (label == PROTOBUF_C_LABEL_REPEATED) {
+ size_t *quantity = STRUCT_MEMBER_P (message, f->quantifier_offset);
+
+ if (*quantity > 0 && *(void **) field == NULL) {
+ return FALSE;
+ }
+
+ if (type == PROTOBUF_C_TYPE_MESSAGE) {
+ ProtobufCMessage **submessage = *(ProtobufCMessage ***) field;
+ unsigned j;
+ for (j = 0; j < *quantity; j++) {
+ if (!protobuf_c_message_check(submessage[j]))
+ return FALSE;
+ }
+ } else if (type == PROTOBUF_C_TYPE_STRING) {
+ char **string = *(char ***) field;
+ unsigned j;
+ for (j = 0; j < *quantity; j++) {
+ if (!string[j])
+ return FALSE;
+ }
+ } else if (type == PROTOBUF_C_TYPE_BYTES) {
+ ProtobufCBinaryData *bd = *(ProtobufCBinaryData **) field;
+ unsigned j;
+ for (j = 0; j < *quantity; j++) {
+ if (bd[j].len > 0 && bd[j].data == NULL)
+ return FALSE;
+ }
+ }
+
+ } else { /* PROTOBUF_C_LABEL_REQUIRED or PROTOBUF_C_LABEL_OPTIONAL */
+
+ if (type == PROTOBUF_C_TYPE_MESSAGE) {
+ ProtobufCMessage *submessage = *(ProtobufCMessage **) field;
+ if (label == PROTOBUF_C_LABEL_REQUIRED || submessage != NULL) {
+ if (!protobuf_c_message_check(submessage))
+ return FALSE;
+ }
+ } else if (type == PROTOBUF_C_TYPE_STRING) {
+ char *string = *(char **) field;
+ if (label == PROTOBUF_C_LABEL_REQUIRED && string == NULL)
+ return FALSE;
+ } else if (type == PROTOBUF_C_TYPE_BYTES) {
+ protobuf_c_boolean *has = STRUCT_MEMBER_P (message, f->quantifier_offset);
+ ProtobufCBinaryData *bd = field;
+ if (label == PROTOBUF_C_LABEL_REQUIRED || *has == TRUE) {
+ if (bd->len > 0 && bd->data == NULL)
+ return FALSE;
+ }
+ }
+ }
+ }
+
+ return TRUE;
+}
- /* Get the array of virtual methods (which are enumerated by
- the generated code) */
- handlers = (GenericHandler *) (service + 1);
+/* === services === */
- /* get our method and invoke it */
- /* TODO: seems like handler==NULL is a situation that
- needs handling */
- handler = handlers[method_index];
- (*handler) (service, input, closure, closure_data);
+typedef void (*GenericHandler) (void *service,
+ const ProtobufCMessage *input,
+ ProtobufCClosure closure,
+ void *closure_data);
+void
+protobuf_c_service_invoke_internal(ProtobufCService *service,
+ unsigned method_index,
+ const ProtobufCMessage *input,
+ ProtobufCClosure closure,
+ void *closure_data)
+{
+ GenericHandler *handlers;
+ GenericHandler handler;
+
+ /*
+ * Verify that method_index is within range. If this fails, you are
+ * likely invoking a newly added method on an old service. (Although
+ * other memory corruption bugs can cause this assertion too.)
+ */
+ assert(method_index < service->descriptor->n_methods);
+
+ /*
+ * Get the array of virtual methods (which are enumerated by the
+ * generated code).
+ */
+ handlers = (GenericHandler *) (service + 1);
+
+ /*
+ * Get our method and invoke it.
+ * \todo Seems like handler == NULL is a situation that needs handling.
+ */
+ handler = handlers[method_index];
+ (*handler)(service, input, closure, closure_data);
}
void
-protobuf_c_service_generated_init (ProtobufCService *service,
- const ProtobufCServiceDescriptor *descriptor,
- ProtobufCServiceDestroy destroy)
+protobuf_c_service_generated_init(ProtobufCService *service,
+ const ProtobufCServiceDescriptor *descriptor,
+ ProtobufCServiceDestroy destroy)
{
- ASSERT_IS_SERVICE_DESCRIPTOR(descriptor);
- service->descriptor = descriptor;
- service->destroy = destroy;
- service->invoke = protobuf_c_service_invoke_internal;
- memset (service + 1, 0, descriptor->n_methods * sizeof (GenericHandler));
+ ASSERT_IS_SERVICE_DESCRIPTOR(descriptor);
+ service->descriptor = descriptor;
+ service->destroy = destroy;
+ service->invoke = protobuf_c_service_invoke_internal;
+ memset(service + 1, 0, descriptor->n_methods * sizeof(GenericHandler));
}
-void protobuf_c_service_destroy (ProtobufCService *service)
+void protobuf_c_service_destroy(ProtobufCService *service)
{
- service->destroy (service);
+ service->destroy(service);
}
/* --- querying the descriptors --- */
+
const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value_by_name
- (const ProtobufCEnumDescriptor *desc,
- const char *name)
-{
- unsigned start = 0, count = desc->n_value_names;
- while (count > 1)
- {
- unsigned mid = start + count / 2;
- int rv = strcmp (desc->values_by_name[mid].name, name);
- if (rv == 0)
- return desc->values + desc->values_by_name[mid].index;
- else if (rv < 0)
- {
- count = start + count - (mid + 1);
- start = mid + 1;
- }
- else
- count = mid - start;
- }
- if (count == 0)
- return NULL;
- if (strcmp (desc->values_by_name[start].name, name) == 0)
- return desc->values + desc->values_by_name[start].index;
- return NULL;
+protobuf_c_enum_descriptor_get_value_by_name(const ProtobufCEnumDescriptor *desc,
+ const char *name)
+{
+ unsigned start = 0;
+ unsigned count = desc->n_value_names;
+
+ while (count > 1) {
+ unsigned mid = start + count / 2;
+ int rv = strcmp(desc->values_by_name[mid].name, name);
+ if (rv == 0)
+ return desc->values + desc->values_by_name[mid].index;
+ else if (rv < 0) {
+ count = start + count - (mid + 1);
+ start = mid + 1;
+ } else
+ count = mid - start;
+ }
+ if (count == 0)
+ return NULL;
+ if (strcmp(desc->values_by_name[start].name, name) == 0)
+ return desc->values + desc->values_by_name[start].index;
+ return NULL;
}
+
const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value
- (const ProtobufCEnumDescriptor *desc,
- int value)
+protobuf_c_enum_descriptor_get_value(const ProtobufCEnumDescriptor *desc,
+ int value)
{
- int rv = int_range_lookup (desc->n_value_ranges, desc->value_ranges, value);
- if (rv < 0)
- return NULL;
- return desc->values + rv;
+ int rv = int_range_lookup(desc->n_value_ranges, desc->value_ranges, value);
+ if (rv < 0)
+ return NULL;
+ return desc->values + rv;
}
const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field_by_name
- (const ProtobufCMessageDescriptor *desc,
- const char *name)
-{
- unsigned start = 0, count = desc->n_fields;
- const ProtobufCFieldDescriptor *field;
- while (count > 1)
- {
- unsigned mid = start + count / 2;
- int rv;
- field = desc->fields + desc->fields_sorted_by_name[mid];
- rv = strcmp (field->name, name);
- if (rv == 0)
- return field;
- else if (rv < 0)
- {
- count = start + count - (mid + 1);
- start = mid + 1;
- }
- else
- count = mid - start;
- }
- if (count == 0)
- return NULL;
- field = desc->fields + desc->fields_sorted_by_name[start];
- if (strcmp (field->name, name) == 0)
- return field;
- return NULL;
+protobuf_c_message_descriptor_get_field_by_name(const ProtobufCMessageDescriptor *desc,
+ const char *name)
+{
+ unsigned start = 0;
+ unsigned count = desc->n_fields;
+ const ProtobufCFieldDescriptor *field;
+
+ while (count > 1) {
+ unsigned mid = start + count / 2;
+ int rv;
+ field = desc->fields + desc->fields_sorted_by_name[mid];
+ rv = strcmp(field->name, name);
+ if (rv == 0)
+ return field;
+ else if (rv < 0) {
+ count = start + count - (mid + 1);
+ start = mid + 1;
+ } else
+ count = mid - start;
+ }
+ if (count == 0)
+ return NULL;
+ field = desc->fields + desc->fields_sorted_by_name[start];
+ if (strcmp(field->name, name) == 0)
+ return field;
+ return NULL;
}
const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field
- (const ProtobufCMessageDescriptor *desc,
- unsigned value)
+protobuf_c_message_descriptor_get_field(const ProtobufCMessageDescriptor *desc,
+ unsigned value)
{
- int rv = int_range_lookup (desc->n_field_ranges,
- desc->field_ranges,
- value);
- if (rv < 0)
- return NULL;
- return desc->fields + rv;
+ int rv = int_range_lookup(desc->n_field_ranges,desc->field_ranges, value);
+ if (rv < 0)
+ return NULL;
+ return desc->fields + rv;
}
const ProtobufCMethodDescriptor *
-protobuf_c_service_descriptor_get_method_by_name
- (const ProtobufCServiceDescriptor *desc,
- const char *name)
-{
- unsigned start = 0, count = desc->n_methods;
- while (count > 1)
- {
- unsigned mid = start + count / 2;
- unsigned mid_index = desc->method_indices_by_name[mid];
- const char *mid_name = desc->methods[mid_index].name;
- int rv = strcmp (mid_name, name);
- if (rv == 0)
- return desc->methods + desc->method_indices_by_name[mid];
- if (rv < 0)
- {
- count = start + count - (mid + 1);
- start = mid + 1;
- }
- else
- {
- count = mid - start;
- }
- }
- if (count == 0)
- return NULL;
- if (strcmp (desc->methods[desc->method_indices_by_name[start]].name, name) == 0)
- return desc->methods + desc->method_indices_by_name[start];
- return NULL;
+protobuf_c_service_descriptor_get_method_by_name(const ProtobufCServiceDescriptor *desc,
+ const char *name)
+{
+ unsigned start = 0;
+ unsigned count = desc->n_methods;
+
+ while (count > 1) {
+ unsigned mid = start + count / 2;
+ unsigned mid_index = desc->method_indices_by_name[mid];
+ const char *mid_name = desc->methods[mid_index].name;
+ int rv = strcmp(mid_name, name);
+
+ if (rv == 0)
+ return desc->methods + desc->method_indices_by_name[mid];
+ if (rv < 0) {
+ count = start + count - (mid + 1);
+ start = mid + 1;
+ } else {
+ count = mid - start;
+ }
+ }
+ if (count == 0)
+ return NULL;
+ if (strcmp(desc->methods[desc->method_indices_by_name[start]].name, name) == 0)
+ return desc->methods + desc->method_indices_by_name[start];
+ return NULL;
}
diff --git a/libpurple/protocols/gg/lib/protobuf-c.h b/libpurple/protocols/gg/lib/protobuf-c.h
index 3b1cac4cc2..de685448f3 100644
--- a/libpurple/protocols/gg/lib/protobuf-c.h
+++ b/libpurple/protocols/gg/lib/protobuf-c.h
@@ -1,552 +1,1078 @@
-/* --- protobuf-c.h: public protobuf c runtime api --- */
-/* Source: http://code.google.com/p/protobuf-c/ r331 */
-
/*
- * Copyright (c) 2008-2011, Dave Benson.
- *
+ * Copyright (c) 2008-2014, Dave Benson and the protobuf-c authors.
* All rights reserved.
- *
- * Redistribution and use in source and binary forms, with
- * or without modification, are permitted provided that the
- * following conditions are met:
- *
- * Redistributions of source code must retain the above
- * copyright notice, this list of conditions and the following
- * disclaimer.
-
- * Redistributions in binary form must reproduce
- * the above copyright notice, this list of conditions and
- * the following disclaimer in the documentation and/or other
- * materials provided with the distribution.
- *
- * Neither the name
- * of "protobuf-c" nor the names of its contributors
- * may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
- * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef __PROTOBUF_C_RUNTIME_H_
-#define __PROTOBUF_C_RUNTIME_H_
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*! \file
+ * \mainpage Introduction
+ *
+ * This is [protobuf-c], a C implementation of [Protocol Buffers].
+ *
+ * This file defines the public API for the `libprotobuf-c` support library.
+ * This API includes interfaces that can be used directly by client code as well
+ * as the interfaces used by the code generated by the `protoc-c` compiler.
+ *
+ * The `libprotobuf-c` support library performs the actual serialization and
+ * deserialization of Protocol Buffers messages. It interacts with structures,
+ * definitions, and metadata generated by the `protoc-c` compiler from .proto
+ * files.
+ *
+ * \authors Dave Benson and the `protobuf-c` authors.
+ *
+ * \copyright 2008-2014. Licensed under the terms of the [BSD-2-Clause] license.
+ *
+ * [protobuf-c]: https://github.com/protobuf-c/protobuf-c
+ * [Protocol Buffers]: https://developers.google.com/protocol-buffers/
+ * [BSD-2-Clause]: http://opensource.org/licenses/BSD-2-Clause
+ *
+ * \page gencode Generated Code
+ *
+ * For each enum, we generate a C enum. For each message, we generate a C
+ * structure which can be cast to a `ProtobufCMessage`.
+ *
+ * For each enum and message, we generate a descriptor object that allows us to
+ * implement a kind of reflection on the structures.
+ *
+ * First, some naming conventions:
+ *
+ * - The name of the type for enums and messages and services is camel case
+ * (meaning WordsAreCrammedTogether) except that double underscores are used
+ * to delimit scopes. For example, the following `.proto` file:
+ *
+~~~{.proto}
+ package foo.bar;
+ message BazBah {
+ optional int32 val = 1;
+ }
+~~~
+ *
+ * would generate a C type `Foo__Bar__BazBah`.
+ *
+ * - Identifiers for functions and globals are all lowercase, with camel case
+ * words separated by single underscores. For example, one of the function
+ * prototypes generated by `protoc-c` for the above example:
+ *
+~~~{.c}
+Foo__Bar__BazBah *
+ foo__bar__baz_bah__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+~~~
+ *
+ * - Identifiers for enum values contain an uppercase prefix which embeds the
+ * package name and the enum type name.
+ *
+ * - A double underscore is used to separate further components of identifier
+ * names.
+ *
+ * For example, in the name of the unpack function above, the package name
+ * `foo.bar` has become `foo__bar`, the message name BazBah has become
+ * `baz_bah`, and the method name is `unpack`. These are all joined with double
+ * underscores to form the C identifier `foo__bar__baz_bah__unpack`.
+ *
+ * We also generate descriptor objects for messages and enums. These are
+ * declared in the `.pb-c.h` files:
+ *
+~~~{.c}
+extern const ProtobufCMessageDescriptor foo__bar__baz_bah__descriptor;
+~~~
+ *
+ * The message structures all begin with `ProtobufCMessageDescriptor *` which is
+ * sufficient to allow them to be cast to `ProtobufCMessage`.
+ *
+ * For each message defined in a `.proto` file, we generate a number of
+ * functions. Each function name contains a prefix based on the package name and
+ * message name in order to make it a unique C identifier.
+ *
+ * - `unpack()`. Unpacks data for a particular message format. Note that the
+ * `allocator` parameter is usually `NULL` to indicate that the system's
+ * `malloc()` and `free()` functions should be used for dynamically allocating
+ * memory.
+ *
+~~~{.c}
+Foo__Bar__BazBah *
+ foo__bar__baz_bah__unpack
+ (ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+~~~
+ *
+ * - `free_unpacked()`. Frees a message object obtained with the `unpack()`
+ * method.
+ *
+~~~{.c}
+void foo__bar__baz_bah__free_unpacked
+ (Foo__Bar__BazBah *message,
+ ProtobufCAllocator *allocator);
+~~~
+ *
+ * - `get_packed_size()`. Calculates the length in bytes of the serialized
+ * representation of the message object.
+ *
+~~~{.c}
+size_t foo__bar__baz_bah__get_packed_size
+ (const Foo__Bar__BazBah *message);
+~~~
+ *
+ * - `pack()`. Pack a message object into a preallocated buffer. Assumes that
+ * the buffer is large enough. (Use `get_packed_size()` first.)
+ *
+~~~{.c}
+size_t foo__bar__baz_bah__pack
+ (const Foo__Bar__BazBah *message,
+ uint8_t *out);
+~~~
+ *
+ * - `pack_to_buffer()`. Packs a message into a "virtual buffer". This is an
+ * object which defines an "append bytes" callback to consume data as it is
+ * serialized.
+ *
+~~~{.c}
+size_t foo__bar__baz_bah__pack_to_buffer
+ (const Foo__Bar__BazBah *message,
+ ProtobufCBuffer *buffer);
+~~~
+ *
+ * \page pack Packing and unpacking messages
+ *
+ * To pack a message, first compute the packed size of the message with
+ * protobuf_c_message_get_packed_size(), then allocate a buffer of at least
+ * that size, then call protobuf_c_message_pack().
+ *
+ * Alternatively, a message can be serialized without calculating the final size
+ * first. Use the protobuf_c_message_pack_to_buffer() function and provide a
+ * ProtobufCBuffer object which implements an "append" method that consumes
+ * data.
+ *
+ * To unpack a message, call the protobuf_c_message_unpack() function. The
+ * result can be cast to an object of the type that matches the descriptor for
+ * the message.
+ *
+ * The result of unpacking a message should be freed with
+ * protobuf_c_message_free_unpacked().
+ */
+
+#ifndef PROTOBUF_C_H
+#define PROTOBUF_C_H
-#include <stddef.h>
#include <assert.h>
#include <limits.h>
-#include "libgadu.h"
+#include <stddef.h>
+#include <stdint.h>
#ifdef __cplusplus
-# define PROTOBUF_C_BEGIN_DECLS extern "C" {
-# define PROTOBUF_C_END_DECLS }
+# define PROTOBUF_C__BEGIN_DECLS extern "C" {
+# define PROTOBUF_C__END_DECLS }
#else
-# define PROTOBUF_C_BEGIN_DECLS
-# define PROTOBUF_C_END_DECLS
+# define PROTOBUF_C__BEGIN_DECLS
+# define PROTOBUF_C__END_DECLS
#endif
-#if !defined(PROTOBUF_C_NO_DEPRECATED) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
-#define PROTOBUF_C_DEPRECATED __attribute__((__deprecated__))
+PROTOBUF_C__BEGIN_DECLS
+
+#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
+# ifdef PROTOBUF_C_EXPORT
+# define PROTOBUF_C__API __declspec(dllexport)
+# else
+# define PROTOBUF_C__API __declspec(dllimport)
+# endif
#else
-#define PROTOBUF_C_DEPRECATED
+# define PROTOBUF_C__API
#endif
-/* The version of protobuf-c you are compiling against. */
-#define PROTOBUF_C_MAJOR 0
-#define PROTOBUF_C_MINOR 14
+#if !defined(PROTOBUF_C__NO_DEPRECATED) && \
+ ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+# define PROTOBUF_C__DEPRECATED __attribute__((__deprecated__))
+#else
+# define PROTOBUF_C__DEPRECATED
+#endif
-/* The version of protobuf-c you are linking against. */
-extern unsigned protobuf_c_major;
-extern unsigned protobuf_c_minor;
+#ifndef PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE
+ #define PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(enum_name) \
+ , _##enum_name##_IS_INT_SIZE = INT_MAX
+#endif
-#define PROTOBUF_C_API
+#define PROTOBUF_C__SERVICE_DESCRIPTOR_MAGIC 0x14159bc3
+#define PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC 0x28aaeef9
+#define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC 0x114315af
-PROTOBUF_C_BEGIN_DECLS
+/**
+ * \defgroup api Public API
+ *
+ * This is the public API for `libprotobuf-c`. These interfaces are stable and
+ * subject to Semantic Versioning guarantees.
+ *
+ * @{
+ */
-typedef enum
-{
- PROTOBUF_C_LABEL_REQUIRED,
- PROTOBUF_C_LABEL_OPTIONAL,
- PROTOBUF_C_LABEL_REPEATED
+/**
+ * Values for the `flags` word in `ProtobufCFieldDescriptor`.
+ */
+typedef enum {
+ /** Set if the field is repeated and marked with the `packed` option. */
+ PROTOBUF_C_FIELD_FLAG_PACKED = (1 << 0),
+
+ /** Set if the field is marked with the `deprecated` option. */
+ PROTOBUF_C_FIELD_FLAG_DEPRECATED = (1 << 1),
+} ProtobufCFieldFlag;
+
+/**
+ * Message field rules.
+ *
+ * \see [Defining A Message Type] in the Protocol Buffers documentation.
+ *
+ * [Defining A Message Type]:
+ * https://developers.google.com/protocol-buffers/docs/proto#simple
+ */
+typedef enum {
+ /** A well-formed message must have exactly one of this field. */
+ PROTOBUF_C_LABEL_REQUIRED,
+
+ /**
+ * A well-formed message can have zero or one of this field (but not
+ * more than one).
+ */
+ PROTOBUF_C_LABEL_OPTIONAL,
+
+ /**
+ * This field can be repeated any number of times (including zero) in a
+ * well-formed message. The order of the repeated values will be
+ * preserved.
+ */
+ PROTOBUF_C_LABEL_REPEATED,
} ProtobufCLabel;
-typedef enum
-{
- PROTOBUF_C_TYPE_INT32,
- PROTOBUF_C_TYPE_SINT32,
- PROTOBUF_C_TYPE_SFIXED32,
- PROTOBUF_C_TYPE_INT64,
- PROTOBUF_C_TYPE_SINT64,
- PROTOBUF_C_TYPE_SFIXED64,
- PROTOBUF_C_TYPE_UINT32,
- PROTOBUF_C_TYPE_FIXED32,
- PROTOBUF_C_TYPE_UINT64,
- PROTOBUF_C_TYPE_FIXED64,
- PROTOBUF_C_TYPE_FLOAT,
- PROTOBUF_C_TYPE_DOUBLE,
- PROTOBUF_C_TYPE_BOOL,
- PROTOBUF_C_TYPE_ENUM,
- PROTOBUF_C_TYPE_STRING,
- PROTOBUF_C_TYPE_BYTES,
- //PROTOBUF_C_TYPE_GROUP, // NOT SUPPORTED
- PROTOBUF_C_TYPE_MESSAGE,
+/**
+ * Field value types.
+ *
+ * \see [Scalar Value Types] in the Protocol Buffers documentation.
+ *
+ * [Scalar Value Types]:
+ * https://developers.google.com/protocol-buffers/docs/proto#scalar
+ */
+typedef enum {
+ PROTOBUF_C_TYPE_INT32, /**< int32 */
+ PROTOBUF_C_TYPE_SINT32, /**< signed int32 */
+ PROTOBUF_C_TYPE_SFIXED32, /**< signed int32 (4 bytes) */
+ PROTOBUF_C_TYPE_INT64, /**< int64 */
+ PROTOBUF_C_TYPE_SINT64, /**< signed int64 */
+ PROTOBUF_C_TYPE_SFIXED64, /**< signed int64 (8 bytes) */
+ PROTOBUF_C_TYPE_UINT32, /**< unsigned int32 */
+ PROTOBUF_C_TYPE_FIXED32, /**< unsigned int32 (4 bytes) */
+ PROTOBUF_C_TYPE_UINT64, /**< unsigned int64 */
+ PROTOBUF_C_TYPE_FIXED64, /**< unsigned int64 (8 bytes) */
+ PROTOBUF_C_TYPE_FLOAT, /**< float */
+ PROTOBUF_C_TYPE_DOUBLE, /**< double */
+ PROTOBUF_C_TYPE_BOOL, /**< boolean */
+ PROTOBUF_C_TYPE_ENUM, /**< enumerated type */
+ PROTOBUF_C_TYPE_STRING, /**< UTF-8 or ASCII string */
+ PROTOBUF_C_TYPE_BYTES, /**< arbitrary byte sequence */
+ PROTOBUF_C_TYPE_MESSAGE, /**< nested message */
} ProtobufCType;
+/**
+ * Field wire types.
+ *
+ * \see [Message Structure] in the Protocol Buffers documentation.
+ *
+ * [Message Structure]:
+ * https://developers.google.com/protocol-buffers/docs/encoding#structure
+ */
+typedef enum {
+ PROTOBUF_C_WIRE_TYPE_VARINT = 0,
+ PROTOBUF_C_WIRE_TYPE_64BIT = 1,
+ PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED = 2,
+ /* "Start group" and "end group" wire types are unsupported. */
+ PROTOBUF_C_WIRE_TYPE_32BIT = 5,
+} ProtobufCWireType;
+struct ProtobufCAllocator;
+struct ProtobufCBinaryData;
+struct ProtobufCBuffer;
+struct ProtobufCBufferSimple;
+struct ProtobufCEnumDescriptor;
+struct ProtobufCEnumValue;
+struct ProtobufCEnumValueIndex;
+struct ProtobufCFieldDescriptor;
+struct ProtobufCIntRange;
+struct ProtobufCMessage;
+struct ProtobufCMessageDescriptor;
+struct ProtobufCMessageUnknownField;
+struct ProtobufCMethodDescriptor;
+struct ProtobufCService;
+struct ProtobufCServiceDescriptor;
+
+typedef struct ProtobufCAllocator ProtobufCAllocator;
+typedef struct ProtobufCBinaryData ProtobufCBinaryData;
+typedef struct ProtobufCBuffer ProtobufCBuffer;
+typedef struct ProtobufCBufferSimple ProtobufCBufferSimple;
+typedef struct ProtobufCEnumDescriptor ProtobufCEnumDescriptor;
+typedef struct ProtobufCEnumValue ProtobufCEnumValue;
+typedef struct ProtobufCEnumValueIndex ProtobufCEnumValueIndex;
+typedef struct ProtobufCFieldDescriptor ProtobufCFieldDescriptor;
+typedef struct ProtobufCIntRange ProtobufCIntRange;
+typedef struct ProtobufCMessage ProtobufCMessage;
+typedef struct ProtobufCMessageDescriptor ProtobufCMessageDescriptor;
+typedef struct ProtobufCMessageUnknownField ProtobufCMessageUnknownField;
+typedef struct ProtobufCMethodDescriptor ProtobufCMethodDescriptor;
+typedef struct ProtobufCService ProtobufCService;
+typedef struct ProtobufCServiceDescriptor ProtobufCServiceDescriptor;
+
+/** Boolean type. */
typedef int protobuf_c_boolean;
-#define PROTOBUF_C_OFFSETOF(struct, member) offsetof(struct, member)
-#define PROTOBUF_C_ASSERT(condition) assert(condition)
-#define PROTOBUF_C_ASSERT_NOT_REACHED() assert(0)
+typedef void (*ProtobufCClosure)(const ProtobufCMessage *, void *closure_data);
+typedef void (*ProtobufCMessageInit)(ProtobufCMessage *);
+typedef void (*ProtobufCServiceDestroy)(ProtobufCService *);
-typedef struct _ProtobufCBinaryData ProtobufCBinaryData;
-struct _ProtobufCBinaryData
-{
- size_t len;
- uint8_t *data;
-};
+/**
+ * Structure for defining a custom memory allocator.
+ */
+struct ProtobufCAllocator {
+ /** Function to allocate memory. */
+ void *(*alloc)(void *allocator_data, size_t size);
-typedef struct _ProtobufCIntRange ProtobufCIntRange; /* private */
+ /** Function to free memory. */
+ void (*free)(void *allocator_data, void *pointer);
-/* --- memory management --- */
-typedef struct _ProtobufCAllocator ProtobufCAllocator;
-struct _ProtobufCAllocator
-{
- void *(*alloc)(void *allocator_data, size_t size);
- void (*free)(void *allocator_data, void *pointer);
- void *(*tmp_alloc)(void *allocator_data, size_t size);
- unsigned max_alloca;
- void *allocator_data;
+ /** Opaque pointer passed to `alloc` and `free` functions. */
+ void *allocator_data;
};
-/* This is a configurable allocator.
- * By default, it uses the system allocator (meaning malloc() and free()).
- * This is typically changed to adapt to frameworks that provide
- * some nonstandard allocation functions.
+/**
+ * Structure for the protobuf `bytes` scalar type.
*
- * NOTE: you may modify this allocator.
+ * The data contained in a `ProtobufCBinaryData` is an arbitrary sequence of
+ * bytes. It may contain embedded `NUL` characters and is not required to be
+ * `NUL`-terminated.
*/
-extern PROTOBUF_C_API ProtobufCAllocator protobuf_c_default_allocator; /* settable */
+struct ProtobufCBinaryData {
+ size_t len; /**< Number of bytes in the `data` field. */
+ uint8_t *data; /**< Data bytes. */
+};
-/* This is the system allocator, meaning it uses malloc() and free().
+/**
+ * Structure for defining a virtual append-only buffer. Used by
+ * protobuf_c_message_pack_to_buffer() to abstract the consumption of serialized
+ * bytes.
*
- * NOTE: please do NOT modify this allocator.
- */
-extern PROTOBUF_C_API ProtobufCAllocator protobuf_c_system_allocator; /* use malloc, free etc */
-
-/* This is the function that our default allocators call when they
- run out-of-memory. The default behavior of this function is to
- terminate your program. */
-extern PROTOBUF_C_API void (*protobuf_c_out_of_memory) (void);
-
-/* --- append-only data buffer --- */
-typedef struct _ProtobufCBuffer ProtobufCBuffer;
-struct _ProtobufCBuffer
-{
- void (*append)(ProtobufCBuffer *buffer,
- size_t len,
- const uint8_t *data);
-};
-/* --- enums --- */
-typedef struct _ProtobufCEnumValue ProtobufCEnumValue;
-typedef struct _ProtobufCEnumValueIndex ProtobufCEnumValueIndex;
-typedef struct _ProtobufCEnumDescriptor ProtobufCEnumDescriptor;
-
-/* ProtobufCEnumValue: this represents a single value of
- * an enumeration.
- * 'name' is the string identifying this value, as given in the .proto file.
- * 'c_name' is the full name of the C enumeration value.
- * 'value' is the number assigned to this value, as given in the .proto file.
- */
-struct _ProtobufCEnumValue
+ * `ProtobufCBuffer` "subclasses" may be defined on the stack. For example, to
+ * write to a `FILE` object:
+ *
+~~~{.c}
+typedef struct {
+ ProtobufCBuffer base;
+ FILE *fp;
+} BufferAppendToFile;
+
+static void
+my_buffer_file_append(ProtobufCBuffer *buffer,
+ size_t len,
+ const uint8_t *data)
{
- const char *name;
- const char *c_name;
- int value;
+ BufferAppendToFile *file_buf = (BufferAppendToFile *) buffer;
+ fwrite(data, len, 1, file_buf->fp); // XXX: No error handling!
+}
+~~~
+ *
+ * To use this new type of ProtobufCBuffer, it could be called as follows:
+ *
+~~~{.c}
+...
+BufferAppendToFile tmp = {0};
+tmp.base.append = my_buffer_file_append;
+tmp.fp = fp;
+protobuf_c_message_pack_to_buffer(&message, &tmp);
+...
+~~~
+ */
+struct ProtobufCBuffer {
+ /** Append function. Consumes the `len` bytes stored at `data`. */
+ void (*append)(ProtobufCBuffer *buffer,
+ size_t len,
+ const uint8_t *data);
};
-/* ProtobufCEnumDescriptor: the represents the enum as a whole,
- * with all its values.
- * 'magic' is a code we check to ensure that the api is used correctly.
- * 'name' is the qualified name (e.g. "namespace.Type").
- * 'short_name' is the unqualified name ("Type"), as given in the .proto file.
- * 'package_name' is the '.'-separated namespace
- * 'n_values' is the number of distinct values.
- * 'values' is the array of distinct values.
- * 'n_value_names' number of named values (including aliases).
- * 'value_names' are the named values (including aliases).
+/**
+ * Simple buffer "subclass" of `ProtobufCBuffer`.
*
- * The rest of the values are private essentially.
+ * A `ProtobufCBufferSimple` object is declared on the stack and uses a
+ * scratch buffer provided by the user for the initial allocation. It performs
+ * exponential resizing, using dynamically allocated memory. A
+ * `ProtobufCBufferSimple` object can be created and used as follows:
*
- * see also: Use protobuf_c_enum_descriptor_get_value_by_name()
- * and protobuf_c_enum_descriptor_get_value() to efficiently
- * lookup values in the descriptor.
+~~~{.c}
+uint8_t pad[128];
+ProtobufCBufferSimple simple = PROTOBUF_C_BUFFER_SIMPLE_INIT(pad);
+ProtobufCBuffer *buffer = (ProtobufCBuffer *) &simple;
+~~~
+ *
+ * `buffer` can now be used with `protobuf_c_message_pack_to_buffer()`. Once a
+ * message has been serialized to a `ProtobufCBufferSimple` object, the
+ * serialized data bytes can be accessed from the `.data` field.
+ *
+ * To free the memory allocated by a `ProtobufCBufferSimple` object, if any,
+ * call PROTOBUF_C_BUFFER_SIMPLE_CLEAR() on the object, for example:
+ *
+~~~{.c}
+PROTOBUF_C_BUFFER_SIMPLE_CLEAR(&simple);
+~~~
+ *
+ * \see PROTOBUF_C_BUFFER_SIMPLE_INIT
+ * \see PROTOBUF_C_BUFFER_SIMPLE_CLEAR
*/
-struct _ProtobufCEnumDescriptor
-{
- uint32_t magic;
-
- const char *name;
- const char *short_name;
- const char *c_name;
- const char *package_name;
-
- /* sorted by value */
- unsigned n_values;
- const ProtobufCEnumValue *values;
-
- /* sorted by name */
- unsigned n_value_names;
- const ProtobufCEnumValueIndex *values_by_name;
-
- /* value-ranges, for faster lookups by number */
- unsigned n_value_ranges;
- const ProtobufCIntRange *value_ranges;
-
- void *reserved1;
- void *reserved2;
- void *reserved3;
- void *reserved4;
+struct ProtobufCBufferSimple {
+ /** "Base class". */
+ ProtobufCBuffer base;
+ /** Number of bytes allocated in `data`. */
+ size_t alloced;
+ /** Number of bytes currently stored in `data`. */
+ size_t len;
+ /** Data bytes. */
+ uint8_t *data;
+ /** Whether `data` must be freed. */
+ protobuf_c_boolean must_free_data;
+ /** Allocator to use. May be NULL to indicate the system allocator. */
+ ProtobufCAllocator *allocator;
};
-/* --- messages --- */
-typedef struct _ProtobufCMessageDescriptor ProtobufCMessageDescriptor;
-typedef struct _ProtobufCFieldDescriptor ProtobufCFieldDescriptor;
-typedef struct _ProtobufCMessage ProtobufCMessage;
-typedef void (*ProtobufCMessageInit)(ProtobufCMessage *);
-/* ProtobufCFieldDescriptor: description of a single field
- * in a message.
- * 'name' is the name of the field, as given in the .proto file.
- * 'id' is the code representing the field, as given in the .proto file.
- * 'label' is one of PROTOBUF_C_LABEL_{REQUIRED,OPTIONAL,REPEATED}
- * 'type' is the type of field.
- * 'quantifier_offset' is the offset in bytes into the message's C structure
- * for this member's "has_MEMBER" field (for optional members) or
- * "n_MEMBER" field (for repeated members).
- * 'offset' is the offset in bytes into the message's C structure
- * for the member itself.
- * 'descriptor' is a pointer to a ProtobufC{Enum,Message}Descriptor
- * if type is PROTOBUF_C_TYPE_{ENUM,MESSAGE} respectively,
- * otherwise NULL.
- * 'default_value' is a pointer to a default value for this field,
- * where allowed.
- * 'packed' is only for REPEATED fields (it is 0 otherwise); this is if
- * the repeated fields is marked with the 'packed' options.
- */
-struct _ProtobufCFieldDescriptor
-{
- const char *name;
- uint32_t id;
- ProtobufCLabel label;
- ProtobufCType type;
- unsigned quantifier_offset;
- unsigned offset;
- const void *descriptor; /* for MESSAGE and ENUM types */
- const void *default_value; /* or NULL if no default-value */
- protobuf_c_boolean packed;
-
- unsigned reserved_flags;
- void *reserved2;
- void *reserved3;
+/**
+ * Describes an enumeration as a whole, with all of its values.
+ */
+struct ProtobufCEnumDescriptor {
+ /** Magic value checked to ensure that the API is used correctly. */
+ uint32_t magic;
+
+ /** The qualified name (e.g., "namespace.Type"). */
+ const char *name;
+ /** The unqualified name as given in the .proto file (e.g., "Type"). */
+ const char *short_name;
+ /** Identifier used in generated C code. */
+ const char *c_name;
+ /** The dot-separated namespace. */
+ const char *package_name;
+
+ /** Number elements in `values`. */
+ unsigned n_values;
+ /** Array of distinct values, sorted by numeric value. */
+ const ProtobufCEnumValue *values;
+
+ /** Number of elements in `values_by_name`. */
+ unsigned n_value_names;
+ /** Array of named values, including aliases, sorted by name. */
+ const ProtobufCEnumValueIndex *values_by_name;
+
+ /** Number of elements in `value_ranges`. */
+ unsigned n_value_ranges;
+ /** Value ranges, for faster lookups by numeric value. */
+ const ProtobufCIntRange *value_ranges;
+
+ /** Reserved for future use. */
+ void *reserved1;
+ /** Reserved for future use. */
+ void *reserved2;
+ /** Reserved for future use. */
+ void *reserved3;
+ /** Reserved for future use. */
+ void *reserved4;
};
-/* ProtobufCMessageDescriptor: description of a message.
- *
- * 'magic' is a code we check to ensure that the api is used correctly.
- * 'name' is the qualified name (e.g. "namespace.Type").
- * 'short_name' is the unqualified name ("Type"), as given in the .proto file.
- * 'c_name' is the c-formatted name of the structure
- * 'package_name' is the '.'-separated namespace
- * 'sizeof_message' is the size in bytes of the C structure
- * representing an instance of this type of message.
- * 'n_fields' is the number of known fields in this message.
- * 'fields' is the fields sorted by id number.
- * 'fields_sorted_by_name', 'n_field_ranges' and 'field_ranges'
- * are used for looking up fields by name and id. (private)
- */
-struct _ProtobufCMessageDescriptor
-{
- uint32_t magic;
- const char *name;
- const char *short_name;
- const char *c_name;
- const char *package_name;
+/**
+ * Represents a single value of an enumeration.
+ */
+struct ProtobufCEnumValue {
+ /** The string identifying this value in the .proto file. */
+ const char *name;
- size_t sizeof_message;
+ /** The string identifying this value in generated C code. */
+ const char *c_name;
- /* sorted by field-id */
- unsigned n_fields;
- const ProtobufCFieldDescriptor *fields;
- const unsigned *fields_sorted_by_name;
+ /** The numeric value assigned in the .proto file. */
+ int value;
+};
- /* ranges, optimization for looking up fields */
- unsigned n_field_ranges;
- const ProtobufCIntRange *field_ranges;
+/**
+ * Used by `ProtobufCEnumDescriptor` to look up enum values.
+ */
+struct ProtobufCEnumValueIndex {
+ /** Name of the enum value. */
+ const char *name;
+ /** Index into values[] array. */
+ unsigned index;
+};
- ProtobufCMessageInit message_init;
- void *reserved1;
- void *reserved2;
- void *reserved3;
+/**
+ * Describes a single field in a message.
+ */
+struct ProtobufCFieldDescriptor {
+ /** Name of the field as given in the .proto file. */
+ const char *name;
+
+ /** Tag value of the field as given in the .proto file. */
+ uint32_t id;
+
+ /** Whether the field is `REQUIRED`, `OPTIONAL`, or `REPEATED`. */
+ ProtobufCLabel label;
+
+ /** The type of the field. */
+ ProtobufCType type;
+
+ /**
+ * The offset in bytes of the message's C structure's quantifier field
+ * (the `has_MEMBER` field for optional members or the `n_MEMBER` field
+ * for repeated members.
+ */
+ unsigned quantifier_offset;
+
+ /**
+ * The offset in bytes into the message's C structure for the member
+ * itself.
+ */
+ unsigned offset;
+
+ /**
+ * A type-specific descriptor.
+ *
+ * If `type` is `PROTOBUF_C_TYPE_ENUM`, then `descriptor` points to the
+ * corresponding `ProtobufCEnumDescriptor`.
+ *
+ * If `type` is `PROTOBUF_C_TYPE_MESSAGE`, then `descriptor` points to
+ * the corresponding `ProtobufCMessageDescriptor`.
+ *
+ * Otherwise this field is NULL.
+ */
+ const void *descriptor; /* for MESSAGE and ENUM types */
+
+ /** The default value for this field, if defined. May be NULL. */
+ const void *default_value;
+
+ /**
+ * A flag word. Zero or more of the bits defined in the
+ * `ProtobufCFieldFlag` enum may be set.
+ */
+ uint32_t flags;
+
+ /** Reserved for future use. */
+ unsigned reserved_flags;
+ /** Reserved for future use. */
+ void *reserved2;
+ /** Reserved for future use. */
+ void *reserved3;
};
+/**
+ * Helper structure for optimizing int => index lookups in the case
+ * where the keys are mostly consecutive values, as they presumably are for
+ * enums and fields.
+ *
+ * The data structures requires that the values in the original array are
+ * sorted.
+ */
+struct ProtobufCIntRange {
+ int start_value;
+ unsigned orig_index;
+ /*
+ * NOTE: the number of values in the range can be inferred by looking
+ * at the next element's orig_index. A dummy element is added to make
+ * this simple.
+ */
+};
-/* ProtobufCMessage: an instance of a message.
+/**
+ * An instance of a message.
*
- * ProtobufCMessage is sort-of a lightweight
- * base-class for all messages.
- *
- * In particular, ProtobufCMessage doesn't have
- * any allocation policy associated with it.
- * That's because it is common to create ProtobufCMessage's
- * on the stack. In fact, we that's what we recommend
- * for sending messages (because if you just allocate from the
- * stack, then you can't really have a memory leak).
+ * `ProtobufCMessage` is a light-weight "base class" for all messages.
*
- * This means that functions like protobuf_c_message_unpack()
- * which return a ProtobufCMessage must be paired
- * with a free function, like protobuf_c_message_free_unpacked().
+ * In particular, `ProtobufCMessage` doesn't have any allocation policy
+ * associated with it. That's because it's common to create `ProtobufCMessage`
+ * objects on the stack. In fact, that's what we recommend for sending messages.
+ * If the object is allocated from the stack, you can't really have a memory
+ * leak.
*
- * 'descriptor' gives the locations and types of the members of message
- * 'n_unknown_fields' is the number of fields we didn't recognize.
- * 'unknown_fields' are fields we didn't recognize.
+ * This means that calls to functions like protobuf_c_message_unpack() which
+ * return a `ProtobufCMessage` must be paired with a call to a free function,
+ * like protobuf_c_message_free_unpacked().
*/
-typedef struct _ProtobufCMessageUnknownField ProtobufCMessageUnknownField;
-struct _ProtobufCMessage
-{
- const ProtobufCMessageDescriptor *descriptor;
- unsigned n_unknown_fields;
- ProtobufCMessageUnknownField *unknown_fields;
+struct ProtobufCMessage {
+ /** The descriptor for this message type. */
+ const ProtobufCMessageDescriptor *descriptor;
+ /** The number of elements in `unknown_fields`. */
+ unsigned n_unknown_fields;
+ /** The fields that weren't recognized by the parser. */
+ ProtobufCMessageUnknownField *unknown_fields;
};
-#define PROTOBUF_C_MESSAGE_INIT(descriptor) { descriptor, 0, NULL }
-/* To pack a message: you have two options:
- (1) you can compute the size of the message
- using protobuf_c_message_get_packed_size()
- then pass protobuf_c_message_pack() a buffer of
- that length.
- (2) Provide a virtual buffer (a ProtobufCBuffer) to
- accept data as we scan through it.
- */
-PROTOBUF_C_API size_t protobuf_c_message_get_packed_size(const ProtobufCMessage *message);
-PROTOBUF_C_API size_t protobuf_c_message_pack (const ProtobufCMessage *message,
- uint8_t *out);
-PROTOBUF_C_API size_t protobuf_c_message_pack_to_buffer (const ProtobufCMessage *message,
- ProtobufCBuffer *buffer);
-
-PROTOBUF_C_API ProtobufCMessage *
- protobuf_c_message_unpack (const ProtobufCMessageDescriptor *,
- ProtobufCAllocator *allocator,
- size_t len,
- const uint8_t *data);
-PROTOBUF_C_API void protobuf_c_message_free_unpacked (ProtobufCMessage *message,
- ProtobufCAllocator *allocator);
-
-/* WARNING: 'message' must be a block of memory
- of size descriptor->sizeof_message. */
-PROTOBUF_C_API void protobuf_c_message_init (const ProtobufCMessageDescriptor *,
- void *message);
-
-/* --- services --- */
-typedef struct _ProtobufCMethodDescriptor ProtobufCMethodDescriptor;
-typedef struct _ProtobufCServiceDescriptor ProtobufCServiceDescriptor;
-
-struct _ProtobufCMethodDescriptor
-{
- const char *name;
- const ProtobufCMessageDescriptor *input;
- const ProtobufCMessageDescriptor *output;
-};
-struct _ProtobufCServiceDescriptor
-{
- uint32_t magic;
-
- const char *name;
- const char *short_name;
- const char *c_name;
- const char *package;
- unsigned n_methods;
- const ProtobufCMethodDescriptor *methods; /* in order from .proto file */
- const unsigned *method_indices_by_name;
+/**
+ * Describes a message.
+ */
+struct ProtobufCMessageDescriptor {
+ /** Magic value checked to ensure that the API is used correctly. */
+ uint32_t magic;
+
+ /** The qualified name (e.g., "namespace.Type"). */
+ const char *name;
+ /** The unqualified name as given in the .proto file (e.g., "Type"). */
+ const char *short_name;
+ /** Identifier used in generated C code. */
+ const char *c_name;
+ /** The dot-separated namespace. */
+ const char *package_name;
+
+ /**
+ * Size in bytes of the C structure representing an instance of this
+ * type of message.
+ */
+ size_t sizeof_message;
+
+ /** Number of elements in `fields`. */
+ unsigned n_fields;
+ /** Field descriptors, sorted by tag number. */
+ const ProtobufCFieldDescriptor *fields;
+ /** Used for looking up fields by name. */
+ const unsigned *fields_sorted_by_name;
+
+ /** Number of elements in `field_ranges`. */
+ unsigned n_field_ranges;
+ /** Used for looking up fields by id. */
+ const ProtobufCIntRange *field_ranges;
+
+ /** Message initialisation function. */
+ ProtobufCMessageInit message_init;
+
+ /** Reserved for future use. */
+ void *reserved1;
+ /** Reserved for future use. */
+ void *reserved2;
+ /** Reserved for future use. */
+ void *reserved3;
};
-typedef struct _ProtobufCService ProtobufCService;
-typedef void (*ProtobufCClosure)(const ProtobufCMessage *message,
- void *closure_data);
-struct _ProtobufCService
-{
- const ProtobufCServiceDescriptor *descriptor;
- void (*invoke)(ProtobufCService *service,
- unsigned method_index,
- const ProtobufCMessage *input,
- ProtobufCClosure closure,
- void *closure_data);
- void (*destroy) (ProtobufCService *service);
+/**
+ * An unknown message field.
+ */
+struct ProtobufCMessageUnknownField {
+ /** The tag number. */
+ uint32_t tag;
+ /** The wire type of the field. */
+ ProtobufCWireType wire_type;
+ /** Number of bytes in `data`. */
+ size_t len;
+ /** Field data. */
+ uint8_t *data;
};
+/**
+ * Method descriptor.
+ */
+struct ProtobufCMethodDescriptor {
+ /** Method name. */
+ const char *name;
+ /** Input message descriptor. */
+ const ProtobufCMessageDescriptor *input;
+ /** Output message descriptor. */
+ const ProtobufCMessageDescriptor *output;
+};
-void protobuf_c_service_destroy (ProtobufCService *);
-
-
-/* --- querying the descriptors --- */
-PROTOBUF_C_API const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value_by_name
- (const ProtobufCEnumDescriptor *desc,
- const char *name);
-PROTOBUF_C_API const ProtobufCEnumValue *
-protobuf_c_enum_descriptor_get_value
- (const ProtobufCEnumDescriptor *desc,
- int value);
-PROTOBUF_C_API const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field_by_name
- (const ProtobufCMessageDescriptor *desc,
- const char *name);
-PROTOBUF_C_API const ProtobufCFieldDescriptor *
-protobuf_c_message_descriptor_get_field
- (const ProtobufCMessageDescriptor *desc,
- unsigned value);
-PROTOBUF_C_API const ProtobufCMethodDescriptor *
-protobuf_c_service_descriptor_get_method_by_name
- (const ProtobufCServiceDescriptor *desc,
- const char *name);
-
-/* --- wire format enums --- */
-typedef enum
-{
- PROTOBUF_C_WIRE_TYPE_VARINT,
- PROTOBUF_C_WIRE_TYPE_64BIT,
- PROTOBUF_C_WIRE_TYPE_LENGTH_PREFIXED,
- PROTOBUF_C_WIRE_TYPE_START_GROUP, /* unsupported */
- PROTOBUF_C_WIRE_TYPE_END_GROUP, /* unsupported */
- PROTOBUF_C_WIRE_TYPE_32BIT
-} ProtobufCWireType;
-
-/* --- unknown message fields --- */
-struct _ProtobufCMessageUnknownField
-{
- uint32_t tag;
- ProtobufCWireType wire_type;
- size_t len;
- uint8_t *data;
+/**
+ * Service.
+ */
+struct ProtobufCService {
+ /** Service descriptor. */
+ const ProtobufCServiceDescriptor *descriptor;
+ /** Function to invoke the service. */
+ void (*invoke)(ProtobufCService *service,
+ unsigned method_index,
+ const ProtobufCMessage *input,
+ ProtobufCClosure closure,
+ void *closure_data);
+ /** Function to destroy the service. */
+ void (*destroy)(ProtobufCService *service);
};
-/* --- extra (superfluous) api: trivial buffer --- */
-typedef struct _ProtobufCBufferSimple ProtobufCBufferSimple;
-struct _ProtobufCBufferSimple
-{
- ProtobufCBuffer base;
- size_t alloced;
- size_t len;
- uint8_t *data;
- protobuf_c_boolean must_free_data;
+/**
+ * Service descriptor.
+ */
+struct ProtobufCServiceDescriptor {
+ /** Magic value checked to ensure that the API is used correctly. */
+ uint32_t magic;
+
+ /** Service name. */
+ const char *name;
+ /** Short version of service name. */
+ const char *short_name;
+ /** C identifier for the service name. */
+ const char *c_name;
+ /** Package name. */
+ const char *package;
+ /** Number of elements in `methods`. */
+ unsigned n_methods;
+ /** Method descriptors, in the order defined in the .proto file. */
+ const ProtobufCMethodDescriptor *methods;
+ /** Sort index of methods. */
+ const unsigned *method_indices_by_name;
};
-#define PROTOBUF_C_BUFFER_SIMPLE_INIT(array_of_bytes) \
-{ { protobuf_c_buffer_simple_append }, \
- sizeof(array_of_bytes), 0, (array_of_bytes), 0 }
-#define PROTOBUF_C_BUFFER_SIMPLE_CLEAR(simp_buf) \
- do { if ((simp_buf)->must_free_data) \
- protobuf_c_default_allocator.free (&protobuf_c_default_allocator.allocator_data, (simp_buf)->data); } while (0)
+/**
+ * Get the version of the protobuf-c library. Note that this is the version of
+ * the library linked against, not the version of the headers compiled against.
+ *
+ * \return A string containing the version number of protobuf-c.
+ */
+PROTOBUF_C__API
+const char *
+protobuf_c_version(void);
-typedef enum
-{
- PROTOBUF_C_CTYPE_INT32,
- PROTOBUF_C_CTYPE_UINT32,
- PROTOBUF_C_CTYPE_INT64,
- PROTOBUF_C_CTYPE_UINT64,
- PROTOBUF_C_CTYPE_FLOAT,
- PROTOBUF_C_CTYPE_DOUBLE,
- PROTOBUF_C_CTYPE_BOOL,
- PROTOBUF_C_CTYPE_ENUM,
- PROTOBUF_C_CTYPE_STRING,
- PROTOBUF_C_CTYPE_BYTES,
- PROTOBUF_C_CTYPE_MESSAGE,
-} ProtobufCCType;
-
-extern ProtobufCCType protobuf_c_type_to_ctype (ProtobufCType type);
-#define protobuf_c_type_to_ctype(type) \
- ((ProtobufCCType)(protobuf_c_type_to_ctype_array[(type)]))
-
-/* ====== private ====== */
-
-/* A little enum helper macro: this will ensure that your
- enum's size is sizeof(int). In protobuf, it need not
- be larger than 32-bits.
-
- This is written assuming it is appended to a list w/o a tail comma. */
-#ifndef _PROTOBUF_C_FORCE_ENUM_TO_BE_INT_SIZE
- #define _PROTOBUF_C_FORCE_ENUM_TO_BE_INT_SIZE(enum_name) \
- , _##enum_name##_IS_INT_SIZE = INT_MAX
-#endif
+/**
+ * Get the version of the protobuf-c library. Note that this is the version of
+ * the library linked against, not the version of the headers compiled against.
+ *
+ * \return A 32 bit unsigned integer containing the version number of
+ * protobuf-c, represented in base-10 as (MAJOR*1E6) + (MINOR*1E3) + PATCH.
+ */
+PROTOBUF_C__API
+uint32_t
+protobuf_c_version_number(void);
-/* === needs to be declared for the PROTOBUF_C_BUFFER_SIMPLE_INIT macro === */
+/**
+ * The version of the protobuf-c headers, represented as a string using the same
+ * format as protobuf_c_version().
+ */
+#define PROTOBUF_C_VERSION "1.0.2"
-void protobuf_c_buffer_simple_append (ProtobufCBuffer *buffer,
- size_t len,
- const unsigned char *data);
+/**
+ * The version of the protobuf-c headers, represented as an integer using the
+ * same format as protobuf_c_version_number().
+ */
+#define PROTOBUF_C_VERSION_NUMBER 1000002
-/* === stuff which needs to be declared for use in the generated code === */
+/**
+ * The minimum protoc-c version which works with the current version of the
+ * protobuf-c headers.
+ */
+#define PROTOBUF_C_MIN_COMPILER_VERSION 1000000
-struct _ProtobufCEnumValueIndex
-{
- const char *name;
- unsigned index; /* into values[] array */
-};
+/**
+ * Look up a `ProtobufCEnumValue` from a `ProtobufCEnumDescriptor` by name.
+ *
+ * \param desc
+ * The `ProtobufCEnumDescriptor` object.
+ * \param name
+ * The `name` field from the corresponding `ProtobufCEnumValue` object to
+ * match.
+ * \return
+ * A `ProtobufCEnumValue` object.
+ * \retval NULL
+ * If not found.
+ */
+PROTOBUF_C__API
+const ProtobufCEnumValue *
+protobuf_c_enum_descriptor_get_value_by_name(
+ const ProtobufCEnumDescriptor *desc,
+ const char *name);
+
+/**
+ * Look up a `ProtobufCEnumValue` from a `ProtobufCEnumDescriptor` by numeric
+ * value.
+ *
+ * \param desc
+ * The `ProtobufCEnumDescriptor` object.
+ * \param value
+ * The `value` field from the corresponding `ProtobufCEnumValue` object to
+ * match.
+ *
+ * \return
+ * A `ProtobufCEnumValue` object.
+ * \retval NULL
+ * If not found.
+ */
+PROTOBUF_C__API
+const ProtobufCEnumValue *
+protobuf_c_enum_descriptor_get_value(
+ const ProtobufCEnumDescriptor *desc,
+ int value);
+
+/**
+ * Look up a `ProtobufCFieldDescriptor` from a `ProtobufCMessageDescriptor` by
+ * the name of the field.
+ *
+ * \param desc
+ * The `ProtobufCMessageDescriptor` object.
+ * \param name
+ * The name of the field.
+ * \return
+ * A `ProtobufCFieldDescriptor` object.
+ * \retval NULL
+ * If not found.
+ */
+PROTOBUF_C__API
+const ProtobufCFieldDescriptor *
+protobuf_c_message_descriptor_get_field_by_name(
+ const ProtobufCMessageDescriptor *desc,
+ const char *name);
+
+/**
+ * Look up a `ProtobufCFieldDescriptor` from a `ProtobufCMessageDescriptor` by
+ * the tag value of the field.
+ *
+ * \param desc
+ * The `ProtobufCMessageDescriptor` object.
+ * \param value
+ * The tag value of the field.
+ * \return
+ * A `ProtobufCFieldDescriptor` object.
+ * \retval NULL
+ * If not found.
+ */
+PROTOBUF_C__API
+const ProtobufCFieldDescriptor *
+protobuf_c_message_descriptor_get_field(
+ const ProtobufCMessageDescriptor *desc,
+ unsigned value);
+
+/**
+ * Determine the number of bytes required to store the serialised message.
+ *
+ * \param message
+ * The message object to serialise.
+ * \return
+ * Number of bytes.
+ */
+PROTOBUF_C__API
+size_t
+protobuf_c_message_get_packed_size(const ProtobufCMessage *message);
-/* IntRange: helper structure for optimizing
- int => index lookups
- in the case where the keys are mostly consecutive values,
- as they presumably are for enums and fields.
+/**
+ * Serialise a message from its in-memory representation.
+ *
+ * This function stores the serialised bytes of the message in a pre-allocated
+ * buffer.
+ *
+ * \param message
+ * The message object to serialise.
+ * \param[out] out
+ * Buffer to store the bytes of the serialised message. This buffer must
+ * have enough space to store the packed message. Use
+ * protobuf_c_message_get_packed_size() to determine the number of bytes
+ * required.
+ * \return
+ * Number of bytes stored in `out`.
+ */
+PROTOBUF_C__API
+size_t
+protobuf_c_message_pack(const ProtobufCMessage *message, uint8_t *out);
- The data structures assumes that the values in the original
- array are sorted */
-struct _ProtobufCIntRange
-{
- int start_value;
- unsigned orig_index;
- /* NOTE: the number of values in the range can
- be inferred by looking at the next element's orig_index.
- a dummy element is added to make this simple */
-};
+/**
+ * Serialise a message from its in-memory representation to a virtual buffer.
+ *
+ * This function calls the `append` method of a `ProtobufCBuffer` object to
+ * consume the bytes generated by the serialiser.
+ *
+ * \param message
+ * The message object to serialise.
+ * \param buffer
+ * The virtual buffer object.
+ * \return
+ * Number of bytes passed to the virtual buffer.
+ */
+PROTOBUF_C__API
+size_t
+protobuf_c_message_pack_to_buffer(
+ const ProtobufCMessage *message,
+ ProtobufCBuffer *buffer);
+
+/**
+ * Unpack a serialised message into an in-memory representation.
+ *
+ * \param descriptor
+ * The message descriptor.
+ * \param allocator
+ * `ProtobufCAllocator` to use for memory allocation. May be NULL to
+ * specify the default allocator.
+ * \param len
+ * Length in bytes of the serialised message.
+ * \param data
+ * Pointer to the serialised message.
+ * \return
+ * An unpacked message object.
+ * \retval NULL
+ * If an error occurred during unpacking.
+ */
+PROTOBUF_C__API
+ProtobufCMessage *
+protobuf_c_message_unpack(
+ const ProtobufCMessageDescriptor *descriptor,
+ ProtobufCAllocator *allocator,
+ size_t len,
+ const uint8_t *data);
+
+/**
+ * Free an unpacked message object.
+ *
+ * This function should be used to deallocate the memory used by a call to
+ * protobuf_c_message_unpack().
+ *
+ * \param message
+ * The message object to free.
+ * \param allocator
+ * `ProtobufCAllocator` to use for memory deallocation. May be NULL to
+ * specify the default allocator.
+ */
+PROTOBUF_C__API
+void
+protobuf_c_message_free_unpacked(
+ ProtobufCMessage *message,
+ ProtobufCAllocator *allocator);
+/**
+ * Check the validity of a message object.
+ *
+ * Makes sure all required fields (`PROTOBUF_C_LABEL_REQUIRED`) are present.
+ * Recursively checks nested messages.
+ *
+ * \retval TRUE
+ * Message is valid.
+ * \retval FALSE
+ * Message is invalid.
+ */
+PROTOBUF_C__API
+protobuf_c_boolean
+protobuf_c_message_check(const ProtobufCMessage *);
-/* === declared for exposition on ProtobufCIntRange === */
-/* note: ranges must have an extra sentinel IntRange at the end whose
- orig_index is set to the number of actual values in the original array */
-/* returns -1 if no orig_index found */
-int protobuf_c_int_ranges_lookup (unsigned n_ranges,
- ProtobufCIntRange *ranges);
+/** Message initialiser. */
+#define PROTOBUF_C_MESSAGE_INIT(descriptor) { descriptor, 0, NULL }
-#define PROTOBUF_C_SERVICE_DESCRIPTOR_MAGIC 0x14159bc3
-#define PROTOBUF_C_MESSAGE_DESCRIPTOR_MAGIC 0x28aaeef9
-#define PROTOBUF_C_ENUM_DESCRIPTOR_MAGIC 0x114315af
+/**
+ * Initialise a message object from a message descriptor.
+ *
+ * \param descriptor
+ * Message descriptor.
+ * \param message
+ * Allocated block of memory of size `descriptor->sizeof_message`.
+ */
+PROTOBUF_C__API
+void
+protobuf_c_message_init(
+ const ProtobufCMessageDescriptor *descriptor,
+ void *message);
+
+/**
+ * Free a service.
+ *
+ * \param service
+ * The service object to free.
+ */
+PROTOBUF_C__API
+void
+protobuf_c_service_destroy(ProtobufCService *service);
-/* === behind the scenes on the generated service's __init functions */
-typedef void (*ProtobufCServiceDestroy) (ProtobufCService *service);
+/**
+ * Look up a `ProtobufCMethodDescriptor` by name.
+ *
+ * \param desc
+ * Service descriptor.
+ * \param name
+ * Name of the method.
+ *
+ * \return
+ * A `ProtobufCMethodDescriptor` object.
+ * \retval NULL
+ * If not found.
+ */
+PROTOBUF_C__API
+const ProtobufCMethodDescriptor *
+protobuf_c_service_descriptor_get_method_by_name(
+ const ProtobufCServiceDescriptor *desc,
+ const char *name);
+
+/**
+ * Initialise a `ProtobufCBufferSimple` object.
+ */
+#define PROTOBUF_C_BUFFER_SIMPLE_INIT(array_of_bytes) \
+{ \
+ { protobuf_c_buffer_simple_append }, \
+ sizeof(array_of_bytes), \
+ 0, \
+ (array_of_bytes), \
+ 0, \
+ NULL \
+}
+
+/**
+ * Clear a `ProtobufCBufferSimple` object, freeing any allocated memory.
+ */
+#define PROTOBUF_C_BUFFER_SIMPLE_CLEAR(simp_buf) \
+do { \
+ if ((simp_buf)->must_free_data) { \
+ if ((simp_buf)->allocator != NULL) \
+ (simp_buf)->allocator->free( \
+ (simp_buf)->allocator, \
+ (simp_buf)->data); \
+ else \
+ free((simp_buf)->data); \
+ } \
+} while (0)
+
+/**
+ * The `append` method for `ProtobufCBufferSimple`.
+ *
+ * \param buffer
+ * The buffer object to append to. Must actually be a
+ * `ProtobufCBufferSimple` object.
+ * \param len
+ * Number of bytes in `data`.
+ * \param data
+ * Data to append.
+ */
+PROTOBUF_C__API
void
-protobuf_c_service_generated_init (ProtobufCService *service,
- const ProtobufCServiceDescriptor *descriptor,
- ProtobufCServiceDestroy destroy);
+protobuf_c_buffer_simple_append(
+ ProtobufCBuffer *buffer,
+ size_t len,
+ const unsigned char *data);
-void
-protobuf_c_service_invoke_internal(ProtobufCService *service,
- unsigned method_index,
- const ProtobufCMessage *input,
- ProtobufCClosure closure,
- void *closure_data);
+PROTOBUF_C__API
+void
+protobuf_c_service_generated_init(
+ ProtobufCService *service,
+ const ProtobufCServiceDescriptor *descriptor,
+ ProtobufCServiceDestroy destroy);
+PROTOBUF_C__API
+void
+protobuf_c_service_invoke_internal(
+ ProtobufCService *service,
+ unsigned method_index,
+ const ProtobufCMessage *input,
+ ProtobufCClosure closure,
+ void *closure_data);
+/**@}*/
-PROTOBUF_C_END_DECLS
+PROTOBUF_C__END_DECLS
-#endif /* __PROTOBUF_C_RUNTIME_H_ */
+#endif /* PROTOBUF_C_H */
diff --git a/libpurple/protocols/gg/lib/protobuf.h b/libpurple/protocols/gg/lib/protobuf.h
index 5453d31d74..366cb6f978 100644
--- a/libpurple/protocols/gg/lib/protobuf.h
+++ b/libpurple/protocols/gg/lib/protobuf.h
@@ -27,7 +27,7 @@
#include "config.h"
#ifdef GG_CONFIG_HAVE_PROTOBUF_C
-#include <google/protobuf-c/protobuf-c.h>
+#include <protobuf-c/protobuf-c.h>
#else
#include "protobuf-c.h"
#endif
diff --git a/libpurple/protocols/gg/lib/protocol.h b/libpurple/protocols/gg/lib/protocol.h
index aee404e57f..ab75ef565e 100644
--- a/libpurple/protocols/gg/lib/protocol.h
+++ b/libpurple/protocols/gg/lib/protocol.h
@@ -334,11 +334,6 @@ struct gg_userlist100_reply {
/* char reply[]; */
} GG_PACKED;
-struct gg_pong110 {
- uint8_t dummy;
- uint32_t time;
-} GG_PACKED;
-
struct gg_chat_create {
uint32_t seq;
uint32_t dummy;
@@ -407,6 +402,7 @@ struct gg_chat_left {
#define GG_UIN_INFO 0x007a
#define GG_TRANSFER_INFO 0x00a0
+#define GG_MAGIC_NOTIFICATION 0x009f
#ifdef _WIN32
#pragma pack(pop)
diff --git a/libpurple/protocols/gg/lib/pubdir50.c b/libpurple/protocols/gg/lib/pubdir50.c
index dc85efe77a..9cef02082c 100644
--- a/libpurple/protocols/gg/lib/pubdir50.c
+++ b/libpurple/protocols/gg/lib/pubdir50.c
@@ -416,7 +416,7 @@ int gg_pubdir50_handle_reply_sess(struct gg_session *sess, struct gg_event *e, c
/* jeśli dostaliśmy namier na następne wyniki, to znaczy że
* mamy koniec wyników i nie jest to kolejna osoba. */
if (!strcasecmp(field, "nextstart")) {
- res->next = atoi(value);
+ res->next = value ? atoi(value) : 0;
num--;
} else {
if (sess->encoding == GG_ENCODING_CP1250) {
diff --git a/libpurple/protocols/gg/lib/sha1.c b/libpurple/protocols/gg/lib/sha1.c
index 1de41601af..38ec7af3a3 100644
--- a/libpurple/protocols/gg/lib/sha1.c
+++ b/libpurple/protocols/gg/lib/sha1.c
@@ -153,7 +153,11 @@ typedef union {
state[3] += d;
state[4] += e;
/* Wipe variables */
- a = b = c = d = e = 0;
+ memset(&a, 0, sizeof(a));
+ memset(&b, 0, sizeof(b));
+ memset(&c, 0, sizeof(c));
+ memset(&d, 0, sizeof(d));
+ memset(&e, 0, sizeof(e));
}
@@ -201,7 +205,7 @@ unsigned int i, j;
static int SHA1_Final(unsigned char digest[20], SHA_CTX* context)
{
-uint32_t i, j;
+uint32_t i;
unsigned char finalcount[8];
for (i = 0; i < 8; i++) {
@@ -218,7 +222,6 @@ unsigned char finalcount[8];
((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
}
/* Wipe variables */
- i = j = 0;
memset(context->buffer, 0, 64);
memset(context->state, 0, 20);
memset(context->count, 0, 8);
@@ -302,6 +305,9 @@ static int gg_file_hash_sha1_part(int fd, SHA_CTX *ctx, off_t pos, size_t len)
if (res == -1 && errno != EINTR)
break;
+ if (res == 0)
+ break;
+
if (res != -1) {
if (!SHA1_Update(ctx, buf, res)) {
res = -1;
View Lorry Controller Status