diff options
author | xrs <xrs@mail36.net> | 2017-03-24 15:31:29 +0100 |
---|---|---|
committer | xrs <xrs@mail36.net> | 2017-03-24 15:31:29 +0100 |
commit | 03512957fb04969d08fb7eac0952a747aa9596ae (patch) | |
tree | b130b8fbab45a8d4fb9a801ece7a7df13fa46b94 /src/social/social_api.c | |
parent | 633c9ed2d8392f0620dee12513f65a4cc602ea60 (diff) | |
parent | 7307d73db807dd1fa295629d2b89c70cf603aeb4 (diff) | |
download | gnunet-03512957fb04969d08fb7eac0952a747aa9596ae.tar.gz gnunet-03512957fb04969d08fb7eac0952a747aa9596ae.zip |
Merge branch 'master' of ssh://gnunet.org/gnunet
Diffstat (limited to 'src/social/social_api.c')
-rw-r--r-- | src/social/social_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/social/social_api.c b/src/social/social_api.c index a7fe0916f..af1d6e57e 100644 --- a/src/social/social_api.c +++ b/src/social/social_api.c | |||
@@ -2110,7 +2110,7 @@ GNUNET_SOCIAL_place_msg_proc_set (struct GNUNET_SOCIAL_Place *plc, | |||
2110 | GNUNET_assert (NULL != method_prefix); | 2110 | GNUNET_assert (NULL != method_prefix); |
2111 | struct MsgProcRequest *mpreq; | 2111 | struct MsgProcRequest *mpreq; |
2112 | uint16_t method_size = strnlen (method_prefix, | 2112 | uint16_t method_size = strnlen (method_prefix, |
2113 | GNUNET_SERVER_MAX_MESSAGE_SIZE | 2113 | GNUNET_MAX_MESSAGE_SIZE |
2114 | - sizeof (*mpreq)) + 1; | 2114 | - sizeof (*mpreq)) + 1; |
2115 | GNUNET_assert ('\0' == method_prefix[method_size - 1]); | 2115 | GNUNET_assert ('\0' == method_prefix[method_size - 1]); |
2116 | 2116 | ||
@@ -2159,7 +2159,7 @@ place_history_replay (struct GNUNET_SOCIAL_Place *plc, | |||
2159 | 2159 | ||
2160 | GNUNET_assert (NULL != method_prefix); | 2160 | GNUNET_assert (NULL != method_prefix); |
2161 | uint16_t method_size = strnlen (method_prefix, | 2161 | uint16_t method_size = strnlen (method_prefix, |
2162 | GNUNET_SERVER_MAX_MESSAGE_SIZE | 2162 | GNUNET_MAX_MESSAGE_SIZE |
2163 | - sizeof (*req)) + 1; | 2163 | - sizeof (*req)) + 1; |
2164 | GNUNET_assert ('\0' == method_prefix[method_size - 1]); | 2164 | GNUNET_assert ('\0' == method_prefix[method_size - 1]); |
2165 | 2165 | ||
@@ -2285,7 +2285,7 @@ place_state_get (struct GNUNET_SOCIAL_Place *plc, | |||
2285 | look->op_id = GNUNET_OP_add (plc->op, &op_recv_state_result, look, NULL); | 2285 | look->op_id = GNUNET_OP_add (plc->op, &op_recv_state_result, look, NULL); |
2286 | 2286 | ||
2287 | GNUNET_assert (NULL != name); | 2287 | GNUNET_assert (NULL != name); |
2288 | size_t name_size = strnlen (name, GNUNET_SERVER_MAX_MESSAGE_SIZE | 2288 | size_t name_size = strnlen (name, GNUNET_MAX_MESSAGE_SIZE |
2289 | - sizeof (*req)) + 1; | 2289 | - sizeof (*req)) + 1; |
2290 | struct GNUNET_MQ_Envelope * | 2290 | struct GNUNET_MQ_Envelope * |
2291 | env = GNUNET_MQ_msg_extra (req, name_size, type); | 2291 | env = GNUNET_MQ_msg_extra (req, name_size, type); |
@@ -2426,7 +2426,7 @@ GNUNET_SOCIAL_zone_add_place (const struct GNUNET_SOCIAL_App *app, | |||
2426 | size_t relay_size = relay_count * sizeof (*relays); | 2426 | size_t relay_size = relay_count * sizeof (*relays); |
2427 | size_t payload_size = name_size + password_size + relay_size; | 2427 | size_t payload_size = name_size + password_size + relay_size; |
2428 | 2428 | ||
2429 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < sizeof (*preq) + payload_size) | 2429 | if (GNUNET_MAX_MESSAGE_SIZE < sizeof (*preq) + payload_size) |
2430 | return GNUNET_SYSERR; | 2430 | return GNUNET_SYSERR; |
2431 | 2431 | ||
2432 | struct GNUNET_MQ_Envelope * | 2432 | struct GNUNET_MQ_Envelope * |
@@ -2506,7 +2506,7 @@ GNUNET_SOCIAL_zone_add_nym (const struct GNUNET_SOCIAL_App *app, | |||
2506 | struct ZoneAddNymRequest *nreq; | 2506 | struct ZoneAddNymRequest *nreq; |
2507 | 2507 | ||
2508 | size_t name_size = strlen (name) + 1; | 2508 | size_t name_size = strlen (name) + 1; |
2509 | if (GNUNET_SERVER_MAX_MESSAGE_SIZE < sizeof (*nreq) + name_size) | 2509 | if (GNUNET_MAX_MESSAGE_SIZE < sizeof (*nreq) + name_size) |
2510 | return GNUNET_SYSERR; | 2510 | return GNUNET_SYSERR; |
2511 | 2511 | ||
2512 | struct GNUNET_MQ_Envelope * | 2512 | struct GNUNET_MQ_Envelope * |