mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

protobuf: use pretty output for inet sockets

Browse Source 
v4:
1) Only address specificator ('A') left

New custom specificators:

'A': output as socket address

Signed-off-by: Stanislav Kinsbursky <skinsbursky@openvz.org>
Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
This commit is contained in:
Stanislav Kinsbursky
2012-08-14 14:50:48 +04:00
committed by Pavel Emelyanov
parent 694576723c
commit 96b62808ff
2 changed files with 22 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
protobuf.c
View File

@@ -3,6 +3,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdlib.h>
#include <arpa/inet.h>
#include <google/protobuf-c/protobuf-c.h>
@@ -12,6 +13,7 @@
#include "log.h"
#include "util.h"
#include "string.h"
#include "sockets.h"
#include "protobuf.h"
#include "protobuf/inventory.pb-c.h"
@@ -128,6 +130,8 @@ void cr_pb_init(void)
*/
#define PB_PKOBJ_LOCAL_SIZE 1024
#define INET_ADDR_LEN 40
struct pb_pr_field_s {
void *data;
int number;
@@ -281,7 +285,23 @@ static size_t pb_show_prepare_field_context(const ProtobufCFieldDescriptor *fd,
static int pb_show_pretty(pb_pr_field_t *field)
{
pr_msg(field->fmt, *(long *)field->data);
switch (field->fmt[0]) {
case '%':
pr_msg(field->fmt, *(long *)field->data);
break;
case 'A':
{
char addr[INET_ADDR_LEN] = "<unknown>";
int family = (field->count == 1) ? AF_INET : AF_INET6;
if (inet_ntop(family, (void *)field->data, addr,
INET_ADDR_LEN) == NULL)
pr_msg("failed to translate");
else
pr_msg("%s", addr);
}
return 1;
}
return 0;
}