summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
95fdf2b)
Fixes the problem of big conf files not showing up in the UI.
Increases the protocol payload from 4 KiB to 8 KiB.
Also, adds some log messages when I/O errors occur, or the payload
is too large for the protocol.
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
#include <string.h>
#include <stdint.h>
#include <asm/byteorder.h>
#include <talloc/talloc.h>
#include <list/list.h>
#include <string.h>
#include <stdint.h>
#include <asm/byteorder.h>
#include <talloc/talloc.h>
#include <list/list.h>
- return total_len ? -1 : 0;
+ if (!total_len)
+ return 0;
+
+ pb_log("%s: failed: %s\n", __func__, strerror(errno));
+ return -1;
}
struct pb_protocol_message *pb_protocol_create_message(void *ctx,
}
struct pb_protocol_message *pb_protocol_create_message(void *ctx,
{
struct pb_protocol_message *message;
{
struct pb_protocol_message *message;
- if (payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE)
+ if (payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
+ pb_log("%s: payload too big %u/%u\n", __func__, payload_len,
+ PB_PROTOCOL_MAX_PAYLOAD_SIZE);
message = talloc_size(ctx, sizeof(*message) + payload_len);
message = talloc_size(ctx, sizeof(*message) + payload_len);
m.payload_len = __be32_to_cpu(m.payload_len);
m.action = __be32_to_cpu(m.action);
m.payload_len = __be32_to_cpu(m.payload_len);
m.action = __be32_to_cpu(m.action);
- if (m.payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE)
+ if (m.payload_len > PB_PROTOCOL_MAX_PAYLOAD_SIZE) {
+ pb_log("%s: payload too big %u/%u\n", __func__, m.payload_len,
+ PB_PROTOCOL_MAX_PAYLOAD_SIZE);
message = talloc_size(ctx, sizeof(m) + m.payload_len);
memcpy(message, &m, sizeof(m));
message = talloc_size(ctx, sizeof(m) + m.payload_len);
memcpy(message, &m, sizeof(m));
if (rc <= 0) {
talloc_free(message);
if (rc <= 0) {
talloc_free(message);
+ pb_log("%s: failed (%u): %s\n", __func__, len,
+ strerror(errno));
#define PB_SOCKET_PATH "/tmp/petitboot.ui"
#define PB_SOCKET_PATH "/tmp/petitboot.ui"
-#define PB_PROTOCOL_MAX_PAYLOAD_SIZE 4096
+#define PB_PROTOCOL_MAX_PAYLOAD_SIZE (8 * 1024)
enum pb_protocol_action {
PB_PROTOCOL_ACTION_ADD = 0x1,
enum pb_protocol_action {
PB_PROTOCOL_ACTION_ADD = 0x1,