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.

1 files changed, 3 insertions, 16 deletions

diff --git a/sys/linux/socket.txt b/sys/linux/socket.txt
index ed8e5f6f2..6c3fc326e 100644
--- a/sys/linux/socket.txt
+++ b/sys/linux/socket.txt
@@ -13,7 +13,7 @@ include <uapi/linux/ethtool.h>
 include <uapi/linux/if_ether.h>
 
 resource sock[fd]
-type sock_port proc[20000, 4, int16be]
+type sock_port int16be[20000:20004]
 
 # TODO: describe socketcall syscall
 
@@ -293,26 +293,13 @@ ifreq_mtu {
 	pad		array[const[0, int8], 20]
 }
 
-syzn_devname {
-	s	const[115, int8]
-	y	const[121, int8]
-	z	const[122, int8]
-	N	proc[48, 1, int8]
-	z0	const[0, int8]
-}
-
 # We could add "eth0" to this list as well, but this will affect the connection
 # between fuzzer and manager and produce lots of "no output" crashes
 # (actually, this is not true now since all testing is done in a separate
 # network namespace, but we still don't mess with eth0).
-devnames = "lo", "tunl0", "gre0", "gretap0", "ip_vti0", "ip6_vti0", "sit0", "ip6tnl0", "ip6gre0", "ip6gretap0", "bond0", "dummy0", "eql", "ifb0", "ipddp0", "yam0", "bcsf0", "bcsh0", "teql0", "nr0", "rose0", "irlan0", "erspan0", "bpq0", "vlan0", "bridge0", "vcan0", "syzkaller0", "syzkaller1"
+devnames = "lo", "tunl0", "gre0", "gretap0", "ip_vti0", "ip6_vti0", "sit0", "ip6tnl0", "ip6gre0", "ip6gretap0", "bond0", "dummy0", "eql", "ifb0", "ipddp0", "yam0", "bcsf0", "bcsh0", "teql0", "nr0", "rose0", "irlan0", "erspan0", "bpq0", "vlan0", "bridge0", "vcan0", "syz_tun", "syzkaller0", "syzkaller1"
 
-devname [
-# TODO: this should be a string, but we currently can't make a random string of fixed size.
-	generic	array[int8, IFNAMSIZ]
-	common	string[devnames, IFNAMSIZ]
-	syzn	syzn_devname
-]
+type devname string[devnames, IFNAMSIZ]
 
 devname_mask {
 	lo	flags[devname_mask_values, int8]