mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-22 09:58:09 +00:00
Code Issues Releases Wiki Activity

crit: Print IP addresses in pretty mode

Browse Source 
There are two places where we store IP addresses (both IPv4 and IPv6).
Mark them with custom option and print them in compressed form for
--pretty output.

Signed-off-by: Pavel Emelyanov <xemul@parallels.com>
Acked-by: Ruslan Kuprieiev <kupruser@gmail.com>
This commit is contained in:
Pavel Emelyanov 2015-01-28 17:16:00 +03:00
parent 0d2aeb3581
commit 9ebb3738b2
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
protobuf/opts.proto
View File

@ -2,6 +2,7 @@ import "google/protobuf/descriptor.proto";
message CRIU_Opts { message CRIU_Opts {
optional bool hex = 1; // Idicate that CRIT should treat this field as hex. optional bool hex = 1; // Idicate that CRIT should treat this field as hex.
optional bool ipadd = 2; // The field is IPv4/v6 address
} }
extend google.protobuf.FieldOptions { extend google.protobuf.FieldOptions {

4
protobuf/sk-inet.proto
View File

@ -22,8 +22,8 @@ message inet_sk_entry {
required uint32 flags = 9 [(criu).hex = true]; required uint32 flags = 9 [(criu).hex = true];
required uint32 backlog = 10; required uint32 backlog = 10;
repeated uint32 src_addr = 11; repeated uint32 src_addr = 11 [(criu).ipadd = true];
repeated uint32 dst_addr = 12; repeated uint32 dst_addr = 12 [(criu).ipadd = true];
required fown_entry fown = 13; required fown_entry fown = 13;
required sk_opts_entry opts = 14; required sk_opts_entry opts = 14;

22
pycriu/images/pb2dict.py
View File

@ -1,5 +1,7 @@
from google.protobuf.descriptor import FieldDescriptor as FD from google.protobuf.descriptor import FieldDescriptor as FD
import opts_pb2 import opts_pb2
import ipaddr
import socket
# pb2dict and dict2pb are methods to convert pb to/from dict. # pb2dict and dict2pb are methods to convert pb to/from dict.
# Inspired by: # Inspired by:
@ -43,6 +45,9 @@ _basic_cast = {
def _marked_as_hex(field): def _marked_as_hex(field):
return field.GetOptions().Extensions[opts_pb2.criu].hex return field.GetOptions().Extensions[opts_pb2.criu].hex
def _marked_as_ip(field):
return field.GetOptions().Extensions[opts_pb2.criu].ipadd
def _pb2dict_cast(field, value, pretty = False, is_hex = False): def _pb2dict_cast(field, value, pretty = False, is_hex = False):
if not is_hex: if not is_hex:
is_hex = _marked_as_hex(field) is_hex = _marked_as_hex(field)
@ -73,8 +78,21 @@ def pb2dict(pb, pretty = False, is_hex = False):
for field, value in pb.ListFields(): for field, value in pb.ListFields():
if field.label == FD.LABEL_REPEATED: if field.label == FD.LABEL_REPEATED:
d_val = [] d_val = []
for v in value: if pretty and _marked_as_ip(field):
d_val.append(_pb2dict_cast(field, v, pretty, is_hex)) if len(value) == 1:
v = socket.ntohl(value[0])
addr = ipaddr.IPv4Address(v)
else:
v = 0 + (socket.ntohl(value[0]) << (32 * 3)) + \
(socket.ntohl(value[1]) << (32 * 2)) + \
(socket.ntohl(value[2]) << (32 * 1)) + \
(socket.ntohl(value[3]))
addr = ipaddr.IPv6Address(v)
d_val.append(addr.compressed)
else:
for v in value:
d_val.append(_pb2dict_cast(field, v, pretty, is_hex))
else: else:
d_val = _pb2dict_cast(field, value, pretty, is_hex) d_val = _pb2dict_cast(field, value, pretty, is_hex)