summaryrefslogtreecommitdiffstats
path: root/tests/expected/lsfd
diff options
context:
space:
mode:
Diffstat (limited to 'tests/expected/lsfd')
-rw-r--r--tests/expected/lsfd/column-ainodeclass-inotify2
-rw-r--r--tests/expected/lsfd/column-ainodeclass-pidfd2
-rw-r--r--tests/expected/lsfd/column-deleted-make-regular-file2
-rw-r--r--tests/expected/lsfd/column-deleted-ro-regular-file2
-rw-r--r--tests/expected/lsfd/column-name-deleted-file2
-rw-r--r--tests/expected/lsfd/column-name-pidfd2
-rw-r--r--tests/expected/lsfd/column-name-ro-regular-file2
-rw-r--r--tests/expected/lsfd/column-name-socketpair2
-rw-r--r--tests/expected/lsfd/column-source-namespace-ASSOC7
-rw-r--r--tests/expected/lsfd/column-source-with-root-SysVIPC-shmem2
-rw-r--r--tests/expected/lsfd/column-type-inotify2
-rw-r--r--tests/expected/lsfd/column-type-pidfd2
-rw-r--r--tests/expected/lsfd/column-type-ro-regular-file2
-rw-r--r--tests/expected/lsfd/column-type-socketpair2
-rw-r--r--tests/expected/lsfd/column-xmode-MODE-r-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-MODE-w-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-MODE-x-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-D-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-flock-ex2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-lease-w2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd--w2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd-rw2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-posix--w2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-L-bit-posix-rw2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-l-bit-flock-sh2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-l-bit-lease-r2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-l-bit-ofd-r-2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-l-bit-posix-r-2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-m-bit3
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-r-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-w-bit2
-rw-r--r--tests/expected/lsfd/column-xmode-XMODE-x-bit2
-rw-r--r--tests/expected/lsfd/filter-broken-exp4
-rw-r--r--tests/expected/lsfd/filter-floating-point-nums15
-rw-r--r--tests/expected/lsfd/mkfds-bpf-map2
-rw-r--r--tests/expected/lsfd/mkfds-bpf-prog2
-rw-r--r--tests/expected/lsfd/mkfds-cdev-tun4
-rw-r--r--tests/expected/lsfd/mkfds-directory2
-rw-r--r--tests/expected/lsfd/mkfds-eventfd12
-rw-r--r--tests/expected/lsfd/mkfds-eventpoll16
-rw-r--r--tests/expected/lsfd/mkfds-inotify4
-rw-r--r--tests/expected/lsfd/mkfds-inotify-btrfs4
-rw-r--r--tests/expected/lsfd/mkfds-mapped-packet-socket8
-rw-r--r--tests/expected/lsfd/mkfds-mqueue8
-rw-r--r--tests/expected/lsfd/mkfds-multiplexing-poll13
-rw-r--r--tests/expected/lsfd/mkfds-multiplexing-ppoll13
-rw-r--r--tests/expected/lsfd/mkfds-multiplexing-pselect613
-rw-r--r--tests/expected/lsfd/mkfds-multiplexing-select13
-rw-r--r--tests/expected/lsfd/mkfds-netlink-groups2
-rw-r--r--tests/expected/lsfd/mkfds-netlink-protocol2
-rw-r--r--tests/expected/lsfd/mkfds-netns2
-rw-r--r--tests/expected/lsfd/mkfds-pidfd2
-rw-r--r--tests/expected/lsfd/mkfds-ping-ping4
-rw-r--r--tests/expected/lsfd/mkfds-ping-ping64
-rw-r--r--tests/expected/lsfd/mkfds-pipe-no-fork4
-rw-r--r--tests/expected/lsfd/mkfds-pty10
-rw-r--r--tests/expected/lsfd/mkfds-raw2
-rw-r--r--tests/expected/lsfd/mkfds-raw62
-rw-r--r--tests/expected/lsfd/mkfds-ro-block-device2
-rw-r--r--tests/expected/lsfd/mkfds-ro-regular-file2
-rw-r--r--tests/expected/lsfd/mkfds-rw-character-device2
-rw-r--r--tests/expected/lsfd/mkfds-signalfd2
-rw-r--r--tests/expected/lsfd/mkfds-socketpair3
-rw-r--r--tests/expected/lsfd/mkfds-socketpair-DGRAM3
-rw-r--r--tests/expected/lsfd/mkfds-socketpair-STREAM3
-rw-r--r--tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT3
-rw-r--r--tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT-halfclose3
-rw-r--r--tests/expected/lsfd/mkfds-socketpair-STREAM-SHUTDOWN-STATE3
-rw-r--r--tests/expected/lsfd/mkfds-symlink2
-rw-r--r--tests/expected/lsfd/mkfds-tcp6
-rw-r--r--tests/expected/lsfd/mkfds-tcp66
-rw-r--r--tests/expected/lsfd/mkfds-timerfd0
-rw-r--r--tests/expected/lsfd/mkfds-timerfd-alarm16
-rw-r--r--tests/expected/lsfd/mkfds-timerfd-boottime-interval-only8
-rw-r--r--tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only8
-rw-r--r--tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval8
-rw-r--r--tests/expected/lsfd/mkfds-udp24
-rw-r--r--tests/expected/lsfd/mkfds-udp624
-rw-r--r--tests/expected/lsfd/mkfds-unix-dgram8
-rw-r--r--tests/expected/lsfd/mkfds-unix-in-netns-dgram4
-rw-r--r--tests/expected/lsfd/mkfds-unix-in-netns-seqpacket4
-rw-r--r--tests/expected/lsfd/mkfds-unix-in-netns-stream4
-rw-r--r--tests/expected/lsfd/mkfds-unix-stream48
-rw-r--r--tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag8
-rw-r--r--tests/expected/lsfd/option-filter-broken-exp7
-rw-r--r--tests/expected/lsfd/option-inet80
-rw-r--r--tests/expected/lsfd/option-summary6
87 files changed, 387 insertions, 147 deletions
diff --git a/tests/expected/lsfd/column-ainodeclass-inotify b/tests/expected/lsfd/column-ainodeclass-inotify
index f93e19e..b1561dd 100644
--- a/tests/expected/lsfd/column-ainodeclass-inotify
+++ b/tests/expected/lsfd/column-ainodeclass-inotify
@@ -1,2 +1,2 @@
- 3 UNKN inotify
+3 UNKN inotify
inotify:ASSOC,STTYPE,AINODECLASS: 0
diff --git a/tests/expected/lsfd/column-ainodeclass-pidfd b/tests/expected/lsfd/column-ainodeclass-pidfd
index 269cea5..5fe751c 100644
--- a/tests/expected/lsfd/column-ainodeclass-pidfd
+++ b/tests/expected/lsfd/column-ainodeclass-pidfd
@@ -1,2 +1,2 @@
- 3 UNKN pidfd
+3 UNKN pidfd
pidfd:ASSOC,STTYPE,AINODECLASS: 0
diff --git a/tests/expected/lsfd/column-deleted-make-regular-file b/tests/expected/lsfd/column-deleted-make-regular-file
new file mode 100644
index 0000000..86e46bc
--- /dev/null
+++ b/tests/expected/lsfd/column-deleted-make-regular-file
@@ -0,0 +1,2 @@
+1
+make-regular-file: DELETED: 0
diff --git a/tests/expected/lsfd/column-deleted-ro-regular-file b/tests/expected/lsfd/column-deleted-ro-regular-file
new file mode 100644
index 0000000..ccaf14e
--- /dev/null
+++ b/tests/expected/lsfd/column-deleted-ro-regular-file
@@ -0,0 +1,2 @@
+0
+ro-regular-file: DELETED: 0
diff --git a/tests/expected/lsfd/column-name-deleted-file b/tests/expected/lsfd/column-name-deleted-file
new file mode 100644
index 0000000..de33c8b
--- /dev/null
+++ b/tests/expected/lsfd/column-name-deleted-file
@@ -0,0 +1,2 @@
+tmp-column-name
+make-regular-file: DELETED,NAME: 0
diff --git a/tests/expected/lsfd/column-name-pidfd b/tests/expected/lsfd/column-name-pidfd
index 49abe81..10e3c5e 100644
--- a/tests/expected/lsfd/column-name-pidfd
+++ b/tests/expected/lsfd/column-name-pidfd
@@ -1,2 +1,2 @@
- 3 anon_inode:[pidfd] pid=1 comm= nspid=1
+3 anon_inode:[pidfd] pid=1 comm= nspid=1
pidfd:ASSOC,KNAME,NAME: 0
diff --git a/tests/expected/lsfd/column-name-ro-regular-file b/tests/expected/lsfd/column-name-ro-regular-file
index 446a916..e7fc7c6 100644
--- a/tests/expected/lsfd/column-name-ro-regular-file
+++ b/tests/expected/lsfd/column-name-ro-regular-file
@@ -1,2 +1,2 @@
- 3 /etc/passwd /etc/passwd
+3 /etc/passwd /etc/passwd
ro-regular-file:ASSOC,KNAME,NAME: 0
diff --git a/tests/expected/lsfd/column-name-socketpair b/tests/expected/lsfd/column-name-socketpair
index bd94e56..b4aaf7b 100644
--- a/tests/expected/lsfd/column-name-socketpair
+++ b/tests/expected/lsfd/column-name-socketpair
@@ -1,2 +1,2 @@
- 3 socket:[INODENUM] state=connected type=dgram
+3 socket:[INODENUM] state=connected type=dgram
socketpair:ASSOC,KNAME,NAME: 0
diff --git a/tests/expected/lsfd/column-source-namespace-ASSOC b/tests/expected/lsfd/column-source-namespace-ASSOC
new file mode 100644
index 0000000..e6ed958
--- /dev/null
+++ b/tests/expected/lsfd/column-source-namespace-ASSOC
@@ -0,0 +1,7 @@
+ ipc nsfs
+ mnt nsfs
+ net nsfs
+ pid nsfs
+pid4c nsfs
+ user nsfs
+ uts nsfs
diff --git a/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem b/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem
new file mode 100644
index 0000000..db40d92
--- /dev/null
+++ b/tests/expected/lsfd/column-source-with-root-SysVIPC-shmem
@@ -0,0 +1,2 @@
+shm tmpfs
+ASSOC,SOURCE: 0
diff --git a/tests/expected/lsfd/column-type-inotify b/tests/expected/lsfd/column-type-inotify
index 69588d9..15363f5 100644
--- a/tests/expected/lsfd/column-type-inotify
+++ b/tests/expected/lsfd/column-type-inotify
@@ -1,2 +1,2 @@
- 3 UNKN inotify
+3 UNKN inotify
inotify:ASSOC,STTYPE,TYPE: 0
diff --git a/tests/expected/lsfd/column-type-pidfd b/tests/expected/lsfd/column-type-pidfd
index a3278d2..6c9a963 100644
--- a/tests/expected/lsfd/column-type-pidfd
+++ b/tests/expected/lsfd/column-type-pidfd
@@ -1,2 +1,2 @@
- 3 UNKN pidfd
+3 UNKN pidfd
pidfd:ASSOC,STTYPE,TYPE: 0
diff --git a/tests/expected/lsfd/column-type-ro-regular-file b/tests/expected/lsfd/column-type-ro-regular-file
index 63b4356..7028264 100644
--- a/tests/expected/lsfd/column-type-ro-regular-file
+++ b/tests/expected/lsfd/column-type-ro-regular-file
@@ -1,2 +1,2 @@
- 3 REG REG
+3 REG REG
ro-regular-file:ASSOC,STTYPE,TYPE: 0
diff --git a/tests/expected/lsfd/column-type-socketpair b/tests/expected/lsfd/column-type-socketpair
index 22a61b7..ec00f65 100644
--- a/tests/expected/lsfd/column-type-socketpair
+++ b/tests/expected/lsfd/column-type-socketpair
@@ -1,2 +1,2 @@
- 3 SOCK UNIX
+3 SOCK UNIX
socketpair:ASSOC,STTYPE,TYPE: 0
diff --git a/tests/expected/lsfd/column-xmode-MODE-r-bit b/tests/expected/lsfd/column-xmode-MODE-r-bit
new file mode 100644
index 0000000..05b2dd1
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-MODE-r-bit
@@ -0,0 +1,2 @@
+r--
+MODE(r-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-MODE-w-bit b/tests/expected/lsfd/column-xmode-MODE-w-bit
new file mode 100644
index 0000000..bd0cca6
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-MODE-w-bit
@@ -0,0 +1,2 @@
+-w-
+MODE(w-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-MODE-x-bit b/tests/expected/lsfd/column-xmode-MODE-x-bit
new file mode 100644
index 0000000..8ab32fd
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-MODE-x-bit
@@ -0,0 +1,2 @@
+r-x
+MODE(x-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-D-bit b/tests/expected/lsfd/column-xmode-XMODE-D-bit
new file mode 100644
index 0000000..5ede600
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-D-bit
@@ -0,0 +1,2 @@
+-w-D--
+XMODE(D-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-flock-ex b/tests/expected/lsfd/column-xmode-XMODE-L-bit-flock-ex
new file mode 100644
index 0000000..3799161
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-flock-ex
@@ -0,0 +1,2 @@
+-w--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-lease-w b/tests/expected/lsfd/column-xmode-XMODE-L-bit-lease-w
new file mode 100644
index 0000000..3799161
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-lease-w
@@ -0,0 +1,2 @@
+-w--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd--w b/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd--w
new file mode 100644
index 0000000..3799161
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd--w
@@ -0,0 +1,2 @@
+-w--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd-rw b/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd-rw
new file mode 100644
index 0000000..1b763f7
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-ofd-rw
@@ -0,0 +1,2 @@
+rw--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix--w b/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix--w
new file mode 100644
index 0000000..3799161
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix--w
@@ -0,0 +1,2 @@
+-w--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix-rw b/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix-rw
new file mode 100644
index 0000000..1b763f7
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-L-bit-posix-rw
@@ -0,0 +1,2 @@
+rw--L-
+XMODE(L-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-l-bit-flock-sh b/tests/expected/lsfd/column-xmode-XMODE-l-bit-flock-sh
new file mode 100644
index 0000000..3299e66
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-l-bit-flock-sh
@@ -0,0 +1,2 @@
+-w--l-
+XMODE(l-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-l-bit-lease-r b/tests/expected/lsfd/column-xmode-XMODE-l-bit-lease-r
new file mode 100644
index 0000000..585ea21
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-l-bit-lease-r
@@ -0,0 +1,2 @@
+r---l-
+XMODE(l-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-l-bit-ofd-r- b/tests/expected/lsfd/column-xmode-XMODE-l-bit-ofd-r-
new file mode 100644
index 0000000..0288697
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-l-bit-ofd-r-
@@ -0,0 +1,2 @@
+rw--l-
+XMODE(l-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-l-bit-posix-r- b/tests/expected/lsfd/column-xmode-XMODE-l-bit-posix-r-
new file mode 100644
index 0000000..0288697
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-l-bit-posix-r-
@@ -0,0 +1,2 @@
+rw--l-
+XMODE(l-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-m-bit b/tests/expected/lsfd/column-xmode-XMODE-m-bit
new file mode 100644
index 0000000..238f28d
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-m-bit
@@ -0,0 +1,3 @@
+r----m
+-w---m
+XMODE(m-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-r-bit b/tests/expected/lsfd/column-xmode-XMODE-r-bit
new file mode 100644
index 0000000..655aa7b
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-r-bit
@@ -0,0 +1,2 @@
+r-----
+XMODE(r-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-w-bit b/tests/expected/lsfd/column-xmode-XMODE-w-bit
new file mode 100644
index 0000000..b4b4b1f
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-w-bit
@@ -0,0 +1,2 @@
+-w----
+XMODE(w-bit): 0
diff --git a/tests/expected/lsfd/column-xmode-XMODE-x-bit b/tests/expected/lsfd/column-xmode-XMODE-x-bit
new file mode 100644
index 0000000..2baf1e7
--- /dev/null
+++ b/tests/expected/lsfd/column-xmode-XMODE-x-bit
@@ -0,0 +1,2 @@
+r-x---
+XMODE(x-bit): 0
diff --git a/tests/expected/lsfd/filter-broken-exp b/tests/expected/lsfd/filter-broken-exp
new file mode 100644
index 0000000..61512e0
--- /dev/null
+++ b/tests/expected/lsfd/filter-broken-exp
@@ -0,0 +1,4 @@
+lsfd: failed to parse "(": <bison syntax error message removed>
+lsfd: failed to parse ")": <bison syntax error message removed>
+lsfd: failed to parse "(FD == 1)garbage": <bison syntax error message removed>
+lsfd: unknown column: NOSUCHCOLUMN
diff --git a/tests/expected/lsfd/filter-floating-point-nums b/tests/expected/lsfd/filter-floating-point-nums
new file mode 100644
index 0000000..60d87a9
--- /dev/null
+++ b/tests/expected/lsfd/filter-floating-point-nums
@@ -0,0 +1,15 @@
+pid in a range: 0
+coparing pids: 0
+3 10.000050000
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10.000051) and (TIMERFD.INTERVAL > 10): 0
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL <= 10) and (TIMERFD.INTERVAL > 9.99): 0
+3 10.000050000
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10): 0
+3 10.000050000
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL >= 10.0): 0
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0 < TIMERFD.INTERVAL): 0
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL < 10) and (0.0 < TIMERFD.INTERVAL): 0
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL > 11): 0
+3 10.000050000
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.00005): 0
+FD,TIMERFD.INTERVAL: (TIMERFD.INTERVAL == 10.000051): 0
diff --git a/tests/expected/lsfd/mkfds-bpf-map b/tests/expected/lsfd/mkfds-bpf-map
new file mode 100644
index 0000000..b4f7964
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-bpf-map
@@ -0,0 +1,2 @@
+array 2 mkfds_map
+BPF-MAP.TYPE,BPF-MAP.TYPE.RAW,BPF.NAME: 0
diff --git a/tests/expected/lsfd/mkfds-bpf-prog b/tests/expected/lsfd/mkfds-bpf-prog
new file mode 100644
index 0000000..b67afc5
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-bpf-prog
@@ -0,0 +1,2 @@
+kprobe 2 mkdfs_prog
+BPF-PROG.TYPE,BPF-PROG.TYPE.RAW,BPF.NAME: 0
diff --git a/tests/expected/lsfd/mkfds-cdev-tun b/tests/expected/lsfd/mkfds-cdev-tun
new file mode 100644
index 0000000..5217d79
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-cdev-tun
@@ -0,0 +1,4 @@
+3 rw- CHR misc:tun
+ASSOC,MODE,TYPE,SOURCE: 0
+NAME: 0
+TUN.IFACE: 0
diff --git a/tests/expected/lsfd/mkfds-directory b/tests/expected/lsfd/mkfds-directory
index fd7f293..62c9d5c 100644
--- a/tests/expected/lsfd/mkfds-directory
+++ b/tests/expected/lsfd/mkfds-directory
@@ -1,4 +1,4 @@
- 3 r-- DIR directory /
+3 r-- DIR directory /
ASSOC,MODE,TYPE,FLAGS,NAME: 0
PID[RUN]: 0
PID[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-eventfd b/tests/expected/lsfd/mkfds-eventfd
new file mode 100644
index 0000000..d99157e
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-eventfd
@@ -0,0 +1,12 @@
+3 rw- eventfd anon_inodefs
+parent: ASSOC,MODE,TYPE,SOURCE: 0
+parent: NAME: 0
+parent: ID: 0
+4 rw- eventfd anon_inodefs
+child: ASSOC,MODE,TYPE,SOURCE: 0
+child: NAME: 0
+child: ID: 0
+NAME[STR]: 0
+ID[STR]: 0
+NAMExID[STR]: 0
+ENDPOINTS[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-eventpoll b/tests/expected/lsfd/mkfds-eventpoll
new file mode 100644
index 0000000..d494fb4
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-eventpoll
@@ -0,0 +1,16 @@
+3 eventpoll tfds=5,7 5
+ 7
+ASSOC,TYPE,NAME,EVENTPOLL.TFDS: 0
+{
+ "lsfd": [
+ {
+ "assoc": "3",
+ "type": "eventpoll",
+ "name": "tfds=5,7",
+ "eventpoll.tfds": [
+ 5, 7
+ ]
+ }
+ ]
+}
+ASSOC,TYPE,NAME,EVENTPOLL.TFDS (JSON): 0
diff --git a/tests/expected/lsfd/mkfds-inotify b/tests/expected/lsfd/mkfds-inotify
new file mode 100644
index 0000000..6fc0d12
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-inotify
@@ -0,0 +1,4 @@
+INOTIFY.INODES.RAW: 0
+INOTIFY.INODES.RAW == CMDLINE\x0aPROC
+INOTIFY.INODES.RAW (JSON): 0
+INOTIFY.INODES.RAW == EXPECTED_JSON
diff --git a/tests/expected/lsfd/mkfds-inotify-btrfs b/tests/expected/lsfd/mkfds-inotify-btrfs
new file mode 100644
index 0000000..cb55f96
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-inotify-btrfs
@@ -0,0 +1,4 @@
+INOTIFY.INODES.RAW: 0
+INOTIFY.INODES.RAW == FSTAB\x0aROOT
+INOTIFY.INODES.RAW (JSON): 0
+INOTIFY.INODES.RAW == EXPECTED_JSON
diff --git a/tests/expected/lsfd/mkfds-mapped-packet-socket b/tests/expected/lsfd/mkfds-mapped-packet-socket
index 7c1b503..ec8795b 100644
--- a/tests/expected/lsfd/mkfds-mapped-packet-socket
+++ b/tests/expected/lsfd/mkfds-mapped-packet-socket
@@ -1,8 +1,8 @@
- PACKET
+PACKET
SOCK.PROTONAME: 0
-type=raw protocol=all iface=lo raw PACKET lo all
+type=raw protocol=all iface=lo raw PACKET lo all
NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0
- PACKET
+PACKET
SOCK.PROTONAME: 0
-type=dgram protocol=all iface=lo dgram PACKET lo all
+type=dgram protocol=all iface=lo dgram PACKET lo all
NAME,SOCK.TYPE,SOCK.PROTONAME,PACKET.IFACE,PACKET.PROTOCOL: 0
diff --git a/tests/expected/lsfd/mkfds-mqueue b/tests/expected/lsfd/mkfds-mqueue
new file mode 100644
index 0000000..b08de13
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-mqueue
@@ -0,0 +1,8 @@
+3 r-- mqueue mqueue /mkfds-mqueue
+parent: ASSOC,MODE,TYPE,SOURCE,NAME: 0
+parent: INODE: 0
+4 -w- mqueue mqueue
+child: ASSOC,MODE,TYPE,SOURCE: 0
+child: INODE: 0
+INODE[STR]: 0
+ENDPOINTS[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-multiplexing-poll b/tests/expected/lsfd/mkfds-multiplexing-poll
new file mode 100644
index 0000000..c23fa0f
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-multiplexing-poll
@@ -0,0 +1,13 @@
+10 r----m
+11 -w----
+12 -w---m
+13 r-----
+14 r----m
+15 -w----
+16 r----m
+17 -w----
+18 -w---m
+19 r-----
+20 r----m
+21 -w----
+[poll] ASSOC,XMODE: 0
diff --git a/tests/expected/lsfd/mkfds-multiplexing-ppoll b/tests/expected/lsfd/mkfds-multiplexing-ppoll
new file mode 100644
index 0000000..46f860b
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-multiplexing-ppoll
@@ -0,0 +1,13 @@
+10 r----m
+11 -w----
+12 -w---m
+13 r-----
+14 r----m
+15 -w----
+16 r----m
+17 -w----
+18 -w---m
+19 r-----
+20 r----m
+21 -w----
+[ppoll] ASSOC,XMODE: 0
diff --git a/tests/expected/lsfd/mkfds-multiplexing-pselect6 b/tests/expected/lsfd/mkfds-multiplexing-pselect6
new file mode 100644
index 0000000..fbdb773
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-multiplexing-pselect6
@@ -0,0 +1,13 @@
+10 r----m
+11 -w----
+12 -w---m
+13 r-----
+14 r----m
+15 -w----
+16 r----m
+17 -w----
+18 -w---m
+19 r-----
+20 r----m
+21 -w----
+[pselect6] ASSOC,XMODE: 0
diff --git a/tests/expected/lsfd/mkfds-multiplexing-select b/tests/expected/lsfd/mkfds-multiplexing-select
new file mode 100644
index 0000000..a44b0da
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-multiplexing-select
@@ -0,0 +1,13 @@
+10 r----m
+11 -w----
+12 -w---m
+13 r-----
+14 r----m
+15 -w----
+16 r----m
+17 -w----
+18 -w---m
+19 r-----
+20 r----m
+21 -w----
+[select] ASSOC,XMODE: 0
diff --git a/tests/expected/lsfd/mkfds-netlink-groups b/tests/expected/lsfd/mkfds-netlink-groups
index ad50da1..e78c8eb 100644
--- a/tests/expected/lsfd/mkfds-netlink-groups
+++ b/tests/expected/lsfd/mkfds-netlink-groups
@@ -1,3 +1,3 @@
- 3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5
+3 NETLINK protocol=sock_diag lport= groups=5 raw sock_diag 5
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL,NETLINK.GROUPS: 0
LPORT: OK
diff --git a/tests/expected/lsfd/mkfds-netlink-protocol b/tests/expected/lsfd/mkfds-netlink-protocol
index df3dce7..77c4e1f 100644
--- a/tests/expected/lsfd/mkfds-netlink-protocol
+++ b/tests/expected/lsfd/mkfds-netlink-protocol
@@ -1,3 +1,3 @@
- 3 NETLINK protocol=sock_diag lport= raw sock_diag 0
+3 NETLINK protocol=sock_diag lport= raw sock_diag 0
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,NETLINK.PROTOCOL: 0
LPORT: OK
diff --git a/tests/expected/lsfd/mkfds-netns b/tests/expected/lsfd/mkfds-netns
index 4b4c0ac..89d5bef 100644
--- a/tests/expected/lsfd/mkfds-netns
+++ b/tests/expected/lsfd/mkfds-netns
@@ -1,4 +1,4 @@
- net
+net
NAME_FD == NAME_NS: 0
NAME_FD == net:[INO_FD]: 0
NAME_FD == net:[INO_NS]: 0
diff --git a/tests/expected/lsfd/mkfds-pidfd b/tests/expected/lsfd/mkfds-pidfd
index 3f7edbb..9484699 100644
--- a/tests/expected/lsfd/mkfds-pidfd
+++ b/tests/expected/lsfd/mkfds-pidfd
@@ -1,2 +1,2 @@
- 3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1
+3 UNKN anon_inodefs pid=1 comm=systemd nspid=1 systemd 1
ASSOC,STTYPE,SOURCE,NAME,PIDFD.COMM,PIDFD.PID: 0
diff --git a/tests/expected/lsfd/mkfds-ping-ping b/tests/expected/lsfd/mkfds-ping-ping
index cad42b1..06fe2bd 100644
--- a/tests/expected/lsfd/mkfds-ping-ping
+++ b/tests/expected/lsfd/mkfds-ping-ping
@@ -1,4 +1,4 @@
- 3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999
+3 PING state=established id=9999 laddr=127.0.0.1 raddr=127.0.0.1 established dgram 127.0.0.1 127.0.0.1 9999
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0
- 3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999
+3 PING state=close id=9999 laddr=127.0.0.1 close dgram 127.0.0.1 0.0.0.0 9999
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,PING.ID: 0
diff --git a/tests/expected/lsfd/mkfds-ping-ping6 b/tests/expected/lsfd/mkfds-ping-ping6
index 3ef9730..6919ba1 100644
--- a/tests/expected/lsfd/mkfds-ping-ping6
+++ b/tests/expected/lsfd/mkfds-ping-ping6
@@ -1,4 +1,4 @@
- 3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999
+3 PINGv6 state=established id=9999 laddr=::1 raddr=::1 established dgram ::1 ::1 9999
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0
- 3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999
+3 PINGv6 state=close id=9999 laddr=::1 close dgram ::1 :: 9999
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,PING.ID: 0
diff --git a/tests/expected/lsfd/mkfds-pipe-no-fork b/tests/expected/lsfd/mkfds-pipe-no-fork
index 390b8a3..4cd2a55 100644
--- a/tests/expected/lsfd/mkfds-pipe-no-fork
+++ b/tests/expected/lsfd/mkfds-pipe-no-fork
@@ -1,5 +1,5 @@
- 3 r-- FIFO pipefs
- 4 -w- FIFO pipefs wronly,nonblock
+3 r-- FIFO pipefs
+4 -w- FIFO pipefs wronly,nonblock
ASSOC,MODE,TYPE,SOURCE,FLAGS: 0
PID[RUN]: 0
PID[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-pty b/tests/expected/lsfd/mkfds-pty
new file mode 100644
index 0000000..ac38fc9
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-pty
@@ -0,0 +1,10 @@
+5 rw- CHR ptmx
+ASSOC,MODE,TYPE,SOURCE: 0
+NAME: 0
+ENDPOINTS: 0
+PTMX.TTY-INDEX: 0
+6 r-- CHR
+ASSOC,MODE,TYPE: 0
+SOURCE: 0
+NAME: 0
+ENDPOINTS: 0
diff --git a/tests/expected/lsfd/mkfds-raw b/tests/expected/lsfd/mkfds-raw
index e8bc41a..37baddc 100644
--- a/tests/expected/lsfd/mkfds-raw
+++ b/tests/expected/lsfd/mkfds-raw
@@ -1,2 +1,2 @@
- 3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5
+3 RAW state=established protocol=5 laddr=127.0.0.1 raddr=127.0.0.2 established raw 127.0.0.1 127.0.0.2 5
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET.LADDR,INET.RADDR,RAW.PROTOCOL: 0
diff --git a/tests/expected/lsfd/mkfds-raw6 b/tests/expected/lsfd/mkfds-raw6
index a813a37..2d77e8f 100644
--- a/tests/expected/lsfd/mkfds-raw6
+++ b/tests/expected/lsfd/mkfds-raw6
@@ -1,2 +1,2 @@
- 3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5
+3 RAWv6 state=established protocol=5 laddr=::1 raddr=::ffff:127.0.0.1 established raw ::1 ::ffff:127.0.0.1 5
ASSOC,TYPE,NAME,SOCK.STATE,SOCK.TYPE,INET6.LADDR,INET6.RADDR,RAW.PROTOCOL: 0
diff --git a/tests/expected/lsfd/mkfds-ro-block-device b/tests/expected/lsfd/mkfds-ro-block-device
index 3b2fe07..4c38d05 100644
--- a/tests/expected/lsfd/mkfds-ro-block-device
+++ b/tests/expected/lsfd/mkfds-ro-block-device
@@ -1,4 +1,4 @@
- 3 r-- BLK 0 loop blk
+3 r-- BLK 0 loop blk
ASSOC,MODE,TYPE,,POS,,BLKDRV,DEVTYPE: 0
NAME[RUN]: 0
NAME[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-ro-regular-file b/tests/expected/lsfd/mkfds-ro-regular-file
index 092f40b..662daa8 100644
--- a/tests/expected/lsfd/mkfds-ro-regular-file
+++ b/tests/expected/lsfd/mkfds-ro-regular-file
@@ -1,4 +1,4 @@
-ABC 3 r-- REG /etc/passwd 1
+ABC 3 r-- REG /etc/passwd 1
COMMAND,ASSOC,MODE,TYPE,NAME,POS: 0
PID[RUN]: 0
PID[STR]: 0
diff --git a/tests/expected/lsfd/mkfds-rw-character-device b/tests/expected/lsfd/mkfds-rw-character-device
index 00423f4..fed92ec 100644
--- a/tests/expected/lsfd/mkfds-rw-character-device
+++ b/tests/expected/lsfd/mkfds-rw-character-device
@@ -1,4 +1,4 @@
- 3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
+3 rw- CHR /dev/zero mem:5 0 1:5 mem char 1:5
ASSOC,MODE,TYPE,NAME,SOURCE,POS,MAJ:MIN,CHRDRV,DEVTYPE,RDEV: 0
DEV[RUN]: 0
STAT[RUN]: 0
diff --git a/tests/expected/lsfd/mkfds-signalfd b/tests/expected/lsfd/mkfds-signalfd
new file mode 100644
index 0000000..16bf732
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-signalfd
@@ -0,0 +1,2 @@
+3 signalfd mask=FPE,USR1,42 FPE,USR1,42
+ASSOC,TYPE,NAME,SIGNALFD.MASK: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair b/tests/expected/lsfd/mkfds-socketpair
deleted file mode 100644
index a015353..0000000
--- a/tests/expected/lsfd/mkfds-socketpair
+++ /dev/null
@@ -1,3 +0,0 @@
- 3 rw- SOCK sockfs UNIX
- 4 rw- SOCK sockfs UNIX
-ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair-DGRAM b/tests/expected/lsfd/mkfds-socketpair-DGRAM
new file mode 100644
index 0000000..d8ba4d0
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-DGRAM
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs UNIX
+4 rw- SOCK sockfs UNIX
+ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair-STREAM b/tests/expected/lsfd/mkfds-socketpair-STREAM
new file mode 100644
index 0000000..d8ba4d0
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-STREAM
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs UNIX
+4 rw- SOCK sockfs UNIX
+ASSOC,MODE,STTYPE,SOURCE,SOCK.PROTONAME: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT b/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT
new file mode 100644
index 0000000..02f6498
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs 1,test_mkfds,4rw
+4 rw- SOCK sockfs 1,test_mkfds,3rw
+ASSOC,MODE,STTYPE,SOURCE,ENDPOINTS: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT-halfclose b/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT-halfclose
new file mode 100644
index 0000000..72fa052
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-STREAM-ENDPOINT-halfclose
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs 1,test_mkfds,4r-
+4 rw- SOCK sockfs 1,test_mkfds,3-w
+ASSOC,MODE,STTYPE,SOURCE,ENDPOINTS: 0
diff --git a/tests/expected/lsfd/mkfds-socketpair-STREAM-SHUTDOWN-STATE b/tests/expected/lsfd/mkfds-socketpair-STREAM-SHUTDOWN-STATE
new file mode 100644
index 0000000..a7a285c
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-socketpair-STREAM-SHUTDOWN-STATE
@@ -0,0 +1,3 @@
+3 rw- SOCK sockfs -w
+4 rw- SOCK sockfs r-
+ASSOC,MODE,STTYPE,SOURCE,SOCK.SHUTDOWN: 0
diff --git a/tests/expected/lsfd/mkfds-symlink b/tests/expected/lsfd/mkfds-symlink
index ab10159..6084e83 100644
--- a/tests/expected/lsfd/mkfds-symlink
+++ b/tests/expected/lsfd/mkfds-symlink
@@ -1,2 +1,2 @@
- 3 --- LINK /dev/stdin nofollow,path
+3 --- LINK /dev/stdin nofollow,path
ASSOC,MODE,TYPE,NAME,FLAGS: 0
diff --git a/tests/expected/lsfd/mkfds-tcp b/tests/expected/lsfd/mkfds-tcp
index dfec0ae..08b5735 100644
--- a/tests/expected/lsfd/mkfds-tcp
+++ b/tests/expected/lsfd/mkfds-tcp
@@ -1,4 +1,4 @@
- 3 TCP SOCK state=listen laddr=127.0.0.1:34567 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
- 4 TCP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
- 5 TCP SOCK state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567 127.0.0.1:23456 23456
+3 TCP SOCK state=listen laddr=127.0.0.1:56789 listen stream 1 127.0.0.1 0.0.0.0 127.0.0.1:56789 56789 0.0.0.0:0 0
+4 TCP SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
+5 TCP SOCK state=established laddr=127.0.0.1:56789 raddr=127.0.0.1:45678 established stream 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789 127.0.0.1:45678 45678
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0
diff --git a/tests/expected/lsfd/mkfds-tcp6 b/tests/expected/lsfd/mkfds-tcp6
index 26b6039..c6e5ee2 100644
--- a/tests/expected/lsfd/mkfds-tcp6
+++ b/tests/expected/lsfd/mkfds-tcp6
@@ -1,4 +1,4 @@
- 3 TCPv6 SOCK state=listen laddr=[::1]:34567 listen stream 1 ::1 :: [::1]:34567 34567 [::]:0 0
- 4 TCPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established stream 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
- 5 TCPv6 SOCK state=established laddr=[::1]:34567 raddr=[::1]:23456 established stream 0 ::1 ::1 [::1]:34567 34567 [::1]:23456 23456
+3 TCPv6 SOCK state=listen laddr=[::1]:56789 listen stream 1 ::1 :: [::1]:56789 56789 [::]:0 0
+4 TCPv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established stream 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
+5 TCPv6 SOCK state=established laddr=[::1]:56789 raddr=[::1]:45678 established stream 0 ::1 ::1 [::1]:56789 56789 [::1]:45678 45678
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,TCP.LADDR,TCP.LPORT,TCP.RADDR,TCP.RPORT: 0
diff --git a/tests/expected/lsfd/mkfds-timerfd b/tests/expected/lsfd/mkfds-timerfd
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-timerfd
diff --git a/tests/expected/lsfd/mkfds-timerfd-alarm b/tests/expected/lsfd/mkfds-timerfd-alarm
new file mode 100644
index 0000000..10dc4c3
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-timerfd-alarm
@@ -0,0 +1,16 @@
+3 timerfd clockid=realtime-alarm
+ASSOC,TYPE,NAME: 0
+realtime-alarm
+CLOCKID: 0
+0.000000000
+TIMERFD.REMAINING: 0
+0.000000000
+TIMERFD.INTERVAL: 0
+3 timerfd clockid=boottime-alarm
+ASSOC,TYPE,NAME: 0
+boottime-alarm
+CLOCKID: 0
+0.000000000
+TIMERFD.REMAINING: 0
+0.000000000
+TIMERFD.INTERVAL: 0
diff --git a/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only b/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only
new file mode 100644
index 0000000..b708c29
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-timerfd-boottime-interval-only
@@ -0,0 +1,8 @@
+3 timerfd clockid=boottime interval=10.123456789
+ASSOC,TYPE,NAME: 0
+boottime
+CLOCKID: 0
+0.000000000
+TIMERFD.REMAINING: 0
+10.123456789
+TIMERFD.INTERVAL: 0
diff --git a/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only b/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only
new file mode 100644
index 0000000..7aedda6
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-timerfd-monotonic-remaining-only
@@ -0,0 +1,8 @@
+3 timerfd clockid=monotonic remaining=100.987654321
+ASSOC,TYPE,NAME: 0
+monotonic
+CLOCKID: 0
+100.987654321
+TIMERFD.REMAINING: 0
+0.000000000
+TIMERFD.INTERVAL: 0
diff --git a/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval b/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval
new file mode 100644
index 0000000..4ba3d8e
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-timerfd-realtime-remaining-and-interval
@@ -0,0 +1,8 @@
+3 timerfd clockid=realtime remaining=100.987654321 interval=5.123456789
+ASSOC,TYPE,NAME: 0
+realtime
+CLOCKID: 0
+100.987654321
+TIMERFD.REMAINING: 0
+5.123456789
+TIMERFD.INTERVAL: 0
diff --git a/tests/expected/lsfd/mkfds-udp b/tests/expected/lsfd/mkfds-udp
index 58ce260..0595e3b 100644
--- a/tests/expected/lsfd/mkfds-udp
+++ b/tests/expected/lsfd/mkfds-udp
@@ -1,24 +1,24 @@
- 3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
- 4 UDP SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
+3 UDP SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:56789 56789 0.0.0.0:0 0
+4 UDP SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
- 3 UDP SOCK 0
+3 UDP SOCK 0
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
NAME pattern match: OK
- 4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567
+4 UDP SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.RADDR,UDP.RPORT: 0
LADDR/LPORT pattern match: OK
- 3 UDP SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
- 4 UDP SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:23456 23456 0.0.0.0:0 0
+3 UDP SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:56789 56789 0.0.0.0:0 0
+4 UDP SOCK state=close laddr=127.0.0.1:45678 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:45678 45678 0.0.0.0:0 0
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
- 3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:34567 34567 0.0.0.0:0 0
- 4 UDP-Lite SOCK state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:23456 23456 127.0.0.1:34567 34567
+3 UDP-Lite SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0 127.0.0.1:56789 56789 0.0.0.0:0 0
+4 UDP-Lite SOCK state=established laddr=127.0.0.1:45678 raddr=127.0.0.1:56789 established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:45678 45678 127.0.0.1:56789 56789
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
- 3 UDP-Lite SOCK 0
+3 UDP-Lite SOCK 0
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
NAME pattern match: OK
- 4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:34567 34567
+4 UDP-Lite SOCK established dgram 0 127.0.0.1 127.0.0.1 127.0.0.1:56789 56789
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0
LADDR/LPORT pattern match: OK
- 3 UDP-Lite SOCK state=close laddr=127.0.0.1:34567 close dgram 0 127.0.0.1 0.0.0.0
- 4 UDP-Lite SOCK state=close laddr=127.0.0.1:23456 close dgram 0 127.0.0.1 0.0.0.0
+3 UDP-Lite SOCK state=close laddr=127.0.0.1:56789 close dgram 0 127.0.0.1 0.0.0.0
+4 UDP-Lite SOCK state=close laddr=127.0.0.1:45678 close dgram 0 127.0.0.1 0.0.0.0
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET.LADDR,INET.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
diff --git a/tests/expected/lsfd/mkfds-udp6 b/tests/expected/lsfd/mkfds-udp6
index e29797b..cbf44d0 100644
--- a/tests/expected/lsfd/mkfds-udp6
+++ b/tests/expected/lsfd/mkfds-udp6
@@ -1,24 +1,24 @@
- 3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
- 4 UDPv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
+3 UDPv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established dgram 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
- 3 UDPv6 SOCK 0
+3 UDPv6 SOCK 0
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
NAME pattern match: OK
- 4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567
+4 UDPv6 SOCK established dgram 0 ::1 ::1 [::1]:56789 56789
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.RADDR,UDP.RPORT: 0
LADDR/LPORT pattern match: OK
- 3 UDPv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
- 4 UDPv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0
+3 UDPv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPv6 SOCK state=close laddr=[::1]:45678 close dgram 0 ::1 :: [::1]:45678 45678 [::]:0 0
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDP.LADDR,UDP.LPORT,UDP.RADDR,UDP.RPORT: 0
- 3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
- 4 UDPLITEv6 SOCK state=established laddr=[::1]:23456 raddr=[::1]:34567 established dgram 0 ::1 ::1 [::1]:23456 23456 [::1]:34567 34567
+3 UDPLITEv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPLITEv6 SOCK state=established laddr=[::1]:45678 raddr=[::1]:56789 established dgram 0 ::1 ::1 [::1]:45678 45678 [::1]:56789 56789
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
- 3 UDPLITEv6 SOCK 0
+3 UDPLITEv6 SOCK 0
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
NAME pattern match: OK
- 4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:34567 34567
+4 UDPLITEv6 SOCK established dgram 0 ::1 ::1 [::1]:56789 56789
ASSOC,TYPE,STTYPE,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.RADDR,UDPLite.RPORT: 0
LADDR/LPORT pattern match: OK
- 3 UDPLITEv6 SOCK state=close laddr=[::1]:34567 close dgram 0 ::1 :: [::1]:34567 34567 [::]:0 0
- 4 UDPLITEv6 SOCK state=close laddr=[::1]:23456 close dgram 0 ::1 :: [::1]:23456 23456 [::]:0 0
+3 UDPLITEv6 SOCK state=close laddr=[::1]:56789 close dgram 0 ::1 :: [::1]:56789 56789 [::]:0 0
+4 UDPLITEv6 SOCK state=close laddr=[::1]:45678 close dgram 0 ::1 :: [::1]:45678 45678 [::]:0 0
ASSOC,TYPE,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,INET6.LADDR,INET6.RADDR,UDPLite.LADDR,UDPLite.LPORT,UDPLite.RADDR,UDPLite.RPORT: 0
diff --git a/tests/expected/lsfd/mkfds-unix-dgram b/tests/expected/lsfd/mkfds-unix-dgram
index b8fd9d4..dfd91e6 100644
--- a/tests/expected/lsfd/mkfds-unix-dgram
+++ b/tests/expected/lsfd/mkfds-unix-dgram
@@ -1,6 +1,6 @@
- 3 SOCK state=connected path=test_mkfds-unix-dgram type=dgram connected dgram 0 test_mkfds-unix-dgram
- 4 SOCK state=connected type=dgram connected dgram 0
+3 SOCK state=connected\x20path=test_mkfds-unix-dgram\x20type=dgram connected dgram 0 test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=connected path=@test_mkfds-unix-dgram type=dgram connected dgram 0 @test_mkfds-unix-dgram
- 4 SOCK state=connected type=dgram connected dgram 0
+3 SOCK state=connected\x20path=@test_mkfds-unix-dgram\x20type=dgram connected dgram 0 @test_mkfds-unix-dgram
+4 SOCK state=connected\x20type=dgram connected dgram 0
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-dgram b/tests/expected/lsfd/mkfds-unix-in-netns-dgram
index c33dd9a..48ac72f 100644
--- a/tests/expected/lsfd/mkfds-unix-in-netns-dgram
+++ b/tests/expected/lsfd/mkfds-unix-in-netns-dgram
@@ -1,6 +1,6 @@
- 5 SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 test_mkfds-unix-dgram-ns
+5 SOCK state=unconnected path=test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 test_mkfds-unix-dgram-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the dgram socket is extracted as expectedly
- 5 SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 @test_mkfds-unix-dgram-ns
+5 SOCK state=unconnected path=@test_mkfds-unix-dgram-ns type=dgram unconnected dgram 0 @test_mkfds-unix-dgram-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the abstract dgram socket is extracted as expectedly
diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket b/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket
index 1f70061..b997e55 100644
--- a/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket
+++ b/tests/expected/lsfd/mkfds-unix-in-netns-seqpacket
@@ -1,6 +1,6 @@
- 5 SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-ns
+5 SOCK state=listen path=test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the seqpacket socket is extracted as expectedly
- 5 SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 @test_mkfds-unix-seqpacket-ns
+5 SOCK state=listen path=@test_mkfds-unix-seqpacket-ns type=seqpacket listen seqpacket 1 @test_mkfds-unix-seqpacket-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the abstract seqpacket socket is extracted as expectedly
diff --git a/tests/expected/lsfd/mkfds-unix-in-netns-stream b/tests/expected/lsfd/mkfds-unix-in-netns-stream
index fd09105..c4ec9d4 100644
--- a/tests/expected/lsfd/mkfds-unix-in-netns-stream
+++ b/tests/expected/lsfd/mkfds-unix-in-netns-stream
@@ -1,6 +1,6 @@
- 5 SOCK state=listen path=test_mkfds-unix-stream-ns listen stream 1 test_mkfds-unix-stream-ns
+5 SOCK state=listen path=test_mkfds-unix-stream-ns listen stream 1 test_mkfds-unix-stream-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the stream socket is extracted as expectedly
- 5 SOCK state=listen path=@test_mkfds-unix-stream-ns listen stream 1 @test_mkfds-unix-stream-ns
+5 SOCK state=listen path=@test_mkfds-unix-stream-ns listen stream 1 @test_mkfds-unix-stream-ns
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
the netns for the abstract stream socket is extracted as expectedly
diff --git a/tests/expected/lsfd/mkfds-unix-stream b/tests/expected/lsfd/mkfds-unix-stream
index c2e64a7..645be81 100644
--- a/tests/expected/lsfd/mkfds-unix-stream
+++ b/tests/expected/lsfd/mkfds-unix-stream
@@ -1,32 +1,32 @@
- 3 SOCK state=listen path=test_mkfds-unix-stream listen stream 1 test_mkfds-unix-stream
- 4 SOCK state=connected connected stream 0
- 5 SOCK state=connected path=test_mkfds-unix-stream connected stream 0 test_mkfds-unix-stream
+3 SOCK state=listen path=test_mkfds-unix-stream listen stream 1 test_mkfds-unix-stream
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=test_mkfds-unix-stream connected stream 0 test_mkfds-unix-stream
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=@test_mkfds-unix-stream-abs listen stream 1 @test_mkfds-unix-stream-abs
- 4 SOCK state=connected connected stream 0
- 5 SOCK state=connected path=@test_mkfds-unix-stream-abs connected stream 0 @test_mkfds-unix-stream-abs
+3 SOCK state=listen path=@test_mkfds-unix-stream-abs listen stream 1 @test_mkfds-unix-stream-abs
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=@test_mkfds-unix-stream-abs connected stream 0 @test_mkfds-unix-stream-abs
(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=test_mkfds-unix-stream-shutdown listen stream 1 test_mkfds-unix-stream-shutdown
- 4 SOCK state=connected connected stream 0
- 5 SOCK state=connected path=test_mkfds-unix-stream-shutdown connected stream 0 test_mkfds-unix-stream-shutdown
+3 SOCK state=listen path=test_mkfds-unix-stream-shutdown listen stream 1 test_mkfds-unix-stream-shutdown
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=test_mkfds-unix-stream-shutdown connected stream 0 test_mkfds-unix-stream-shutdown
(shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=test_mkfds-unix with spaces stream listen stream 1 test_mkfds-unix with spaces stream
- 4 SOCK state=connected connected stream 0
- 5 SOCK state=connected path=test_mkfds-unix with spaces stream connected stream 0 test_mkfds-unix with spaces stream
+3 SOCK state=listen path=test_mkfds-unix with spaces stream listen stream 1 test_mkfds-unix with spaces stream
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=test_mkfds-unix with spaces stream connected stream 0 test_mkfds-unix with spaces stream
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket
- 4 SOCK state=connected type=seqpacket connected seqpacket 0
- 5 SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket
+3 SOCK state=listen path=test_mkfds-unix-seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket
+4 SOCK state=connected type=seqpacket connected seqpacket 0
+5 SOCK state=connected path=test_mkfds-unix-seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=@test_mkfds-unix-seqpacket-abs listen stream 1 @test_mkfds-unix-seqpacket-abs
- 4 SOCK state=connected connected stream 0
- 5 SOCK state=connected path=@test_mkfds-unix-seqpacket-abs connected stream 0 @test_mkfds-unix-seqpacket-abs
+3 SOCK state=listen path=@test_mkfds-unix-seqpacket-abs listen stream 1 @test_mkfds-unix-seqpacket-abs
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=@test_mkfds-unix-seqpacket-abs connected stream 0 @test_mkfds-unix-seqpacket-abs
(abs) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-shutdown
- 4 SOCK state=connected type=seqpacket connected seqpacket 0
- 5 SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket-shutdown
+3 SOCK state=listen path=test_mkfds-unix-seqpacket-shutdown type=seqpacket listen seqpacket 1 test_mkfds-unix-seqpacket-shutdown
+4 SOCK state=connected type=seqpacket connected seqpacket 0
+5 SOCK state=connected path=test_mkfds-unix-seqpacket-shutdown type=seqpacket connected seqpacket 0 test_mkfds-unix-seqpacket-shutdown
(shutdown) ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
- 3 SOCK state=listen path=test_mkfds-unix with spaces seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix with spaces seqpacket
- 4 SOCK state=connected type=seqpacket connected seqpacket 0
- 5 SOCK state=connected path=test_mkfds-unix with spaces seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix with spaces seqpacket
+3 SOCK state=listen path=test_mkfds-unix with spaces seqpacket type=seqpacket listen seqpacket 1 test_mkfds-unix with spaces seqpacket
+4 SOCK state=connected type=seqpacket connected seqpacket 0
+5 SOCK state=connected path=test_mkfds-unix with spaces seqpacket type=seqpacket connected seqpacket 0 test_mkfds-unix with spaces seqpacket
ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag b/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag
new file mode 100644
index 0000000..946c95f
--- /dev/null
+++ b/tests/expected/lsfd/mkfds-unix-stream-requiring-sockdiag
@@ -0,0 +1,8 @@
+3 SOCK state=listen path=test_mkfds-unix with newline stream a\x0ab\x0ac listen stream 1 test_mkfds-unix with newline stream a\x0ab\x0ac
+4 SOCK state=connected connected stream 0
+5 SOCK state=connected path=test_mkfds-unix with newline stream a\x0ab\x0ac connected stream 0 test_mkfds-unix with newline stream a\x0ab\x0ac
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
+3 SOCK state=listen path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket listen seqpacket 1 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
+4 SOCK state=connected type=seqpacket connected seqpacket 0
+5 SOCK state=connected path=test_mkfds-unix with newline seqpacket a\x0ab\x0ac type=seqpacket connected seqpacket 0 test_mkfds-unix with newline seqpacket a\x0ab\x0ac
+ASSOC,STTYPE,NAME,SOCK.STATE,SOCK.TYPE,SOCK.LISTENING,UNIX.PATH: 0
diff --git a/tests/expected/lsfd/option-filter-broken-exp b/tests/expected/lsfd/option-filter-broken-exp
deleted file mode 100644
index 8c14f22..0000000
--- a/tests/expected/lsfd/option-filter-broken-exp
+++ /dev/null
@@ -1,7 +0,0 @@
-lsfd: error: empty filter expression
-lsfd: error: empty filter expression
-lsfd: error: unbalanced parenthesis: )
-lsfd: error: unexpected token: garbage after OP2
-lsfd: error: bool expression is expected: FD
-lsfd: unknown column: NOSUCHCOLUMN
-lsfd: error: no such column: NOSUCHCOLUMN
diff --git a/tests/expected/lsfd/option-inet b/tests/expected/lsfd/option-inet
index cebfded..66edac9 100644
--- a/tests/expected/lsfd/option-inet
+++ b/tests/expected/lsfd/option-inet
@@ -1,46 +1,46 @@
# --inet
- 3 TCP state=listen laddr=127.0.0.1:34567
- 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
- 3 TCPv6 state=listen laddr=[::1]:34567
- 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
- 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
- 3 UDP state=close laddr=127.0.0.1:34567
- 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 3 UDPLITEv6 state=close laddr=[::1]:34567
- 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+3 TCP state=listen laddr=127.0.0.1:34567
+4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
+3 TCPv6 state=listen laddr=[::1]:34567
+4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
+3 UDP state=close laddr=127.0.0.1:34567
+4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+3 UDPLITEv6 state=close laddr=[::1]:34567
+4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
# --inet=4
- 3 TCP state=listen laddr=127.0.0.1:34567
- 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
- 3 UDP state=close laddr=127.0.0.1:34567
- 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+3 TCP state=listen laddr=127.0.0.1:34567
+4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
+3 UDP state=close laddr=127.0.0.1:34567
+4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
# --inet=6
- 3 TCPv6 state=listen laddr=[::1]:34567
- 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
- 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
- 3 UDPLITEv6 state=close laddr=[::1]:34567
- 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+3 TCPv6 state=listen laddr=[::1]:34567
+4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
+3 UDPLITEv6 state=close laddr=[::1]:34567
+4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
# -i
- 3 TCP state=listen laddr=127.0.0.1:34567
- 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
- 3 TCPv6 state=listen laddr=[::1]:34567
- 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
- 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
- 3 UDP state=close laddr=127.0.0.1:34567
- 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 3 UDPLITEv6 state=close laddr=[::1]:34567
- 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+3 TCP state=listen laddr=127.0.0.1:34567
+4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
+3 TCPv6 state=listen laddr=[::1]:34567
+4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
+3 UDP state=close laddr=127.0.0.1:34567
+4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+3 UDPLITEv6 state=close laddr=[::1]:34567
+4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
# -i4
- 3 TCP state=listen laddr=127.0.0.1:34567
- 4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
- 5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
- 3 UDP state=close laddr=127.0.0.1:34567
- 4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+3 TCP state=listen laddr=127.0.0.1:34567
+4 TCP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
+5 TCP state=established laddr=127.0.0.1:34567 raddr=127.0.0.1:23456
+3 UDP state=close laddr=127.0.0.1:34567
+4 UDP state=established laddr=127.0.0.1:23456 raddr=127.0.0.1:34567
# -i6
- 3 TCPv6 state=listen laddr=[::1]:34567
- 4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
- 5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
- 3 UDPLITEv6 state=close laddr=[::1]:34567
- 4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+3 TCPv6 state=listen laddr=[::1]:34567
+4 TCPv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
+5 TCPv6 state=established laddr=[::1]:34567 raddr=[::1]:23456
+3 UDPLITEv6 state=close laddr=[::1]:34567
+4 UDPLITEv6 state=established laddr=[::1]:23456 raddr=[::1]:34567
diff --git a/tests/expected/lsfd/option-summary b/tests/expected/lsfd/option-summary
index 4e96f55..058de37 100644
--- a/tests/expected/lsfd/option-summary
+++ b/tests/expected/lsfd/option-summary
@@ -1,3 +1,3 @@
- 10 GROUP
- 3 PASSWD
- 13 PROC
+10 GROUP
+ 3 PASSWD
+13 PROC