From b37b65b0e69a4d22551aa6a207856ad7b3801e69 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Mon, 26 Feb 2018 16:48:31 +0100 Subject: sys/linux: remove proc type from network descriptions We now always create net namespace for testing, so socket ports and other IDs do not overlap between different test processes. Proc types play badly with squashing packets to ANYBLOB. To squash into a block we need concrete value, but it depends on process id. Removing proc also makes tun setup and address descriptions simpler. --- sys/linux/socket_key.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'sys/linux/socket_key.txt') diff --git a/sys/linux/socket_key.txt b/sys/linux/socket_key.txt index 47253a8ea..1e6a57ccd 100644 --- a/sys/linux/socket_key.txt +++ b/sys/linux/socket_key.txt @@ -62,7 +62,7 @@ sadb_ext_hdr [ sadb_sa { sadb_len bytesize8[parent, int16] sadb_exttype const[SADB_EXT_SA, int16] - sadb_sa_spi proc[1234, 4, int32be] + sadb_sa_spi xfrm_spi sadb_sa_replay int8 sadb_sa_state int8 sadb_sa_auth int8[SADB_AALG_NONE:SADB_AALG_MAX] @@ -114,9 +114,8 @@ sadb_ident { sadb_spirange { sadb_len bytesize8[parent, int16] sadb_exttype const[SADB_EXT_SPIRANGE, int16] -# TODO: should this be int32be or not? - sadb_spirange_min proc[1234, 4, int32] - sadb_spirange_max proc[1234, 4, int32] + sadb_spirange_min xfrm_spi + sadb_spirange_max xfrm_spi sadb_spirange_reserved const[0, int32] } [packed, align_8] -- cgit mrf-deployment