Hi,
I've been running iked for a while now and have been able to guess which iked
belongs to which rdomain by the cpu counter but as I'm using the other iked
more the cpu counter is about the same and it's confusing when I have to
restart iked with route exec.
I introduce the -r flag to fstat in order to display rdomains on sockets in
order to find the right iked. The fix is simple but because some peoples
scripts may depend on the old output I made it an extra flag.
Here is how it looks like with and without the -r flag:
uranus$ fstat -rp 84169
USER CMD PID FD MOUNT INUM MODE R/W SZ|DV
_iked iked 84169 text / 105245 -r-xr-xr-x r 321760
_iked iked 84169 wd /var 129920 drwxr-xr-x r 512
_iked iked 84169 root /var 129920 drwxr-xr-x r 512
_iked iked 84169 0 / 105143 crw-rw-rw- rw null
_iked iked 84169 1 / 105143 crw-rw-rw- rw null
_iked iked 84169 2 / 105143 crw-rw-rw- rw null
_iked iked 84169 3* 30 raw 2 0xd2f8f844
_iked iked 84169 4* rdomain 2 internet dgram udp *:500
_iked iked 84169 5* rdomain 2 internet dgram udp *:4500
_iked iked 84169 6* rdomain 2 internet6 dgram udp *:500
_iked iked 84169 7* rdomain 2 internet6 dgram udp *:4500
_iked iked 84169 8* unix stream 0xd3eb4180 <-> 0xd3eb4100
_iked iked 84169 10* unix stream 0xd3eb4280 <-> 0xd3eb4200
_iked iked 84169 11 kqueue 0xd32a8ad4 0 state: W
uranus$ fstat -p 47863
USER CMD PID FD MOUNT INUM MODE R/W SZ|DV
_iked iked 47863 text / 105245 -r-xr-xr-x r 321760
_iked iked 47863 wd /var 129920 drwxr-xr-x r 512
_iked iked 47863 root /var 129920 drwxr-xr-x r 512
_iked iked 47863 0 / 105143 crw-rw-rw- rw null
_iked iked 47863 1 / 105143 crw-rw-rw- rw null
_iked iked 47863 2 / 105143 crw-rw-rw- rw null
_iked iked 47863 3* 30 raw 2 0xd3258e88
_iked iked 47863 4* internet dgram udp *:500
_iked iked 47863 5* internet dgram udp *:4500
_iked iked 47863 6* internet6 dgram udp *:500
_iked iked 47863 7* internet6 dgram udp *:4500
_iked iked 47863 8* unix stream 0xd3e67c00 <-> 0xd3e67b80
_iked iked 47863 10* unix stream 0xd3e67d00 <-> 0xd3e67c80
_iked iked 47863 11 kqueue 0xd32a8e7c 0 state: W
patch below signature.
Regards,
-peter
Index: fstat.1
===================================================================
RCS file: /cvs/src/usr.bin/fstat/fstat.1,v
retrieving revision 1.56
diff -u -p -u -r1.56 fstat.1
--- fstat.1 16 Mar 2018 16:58:26 -0000 1.56
+++ fstat.1 7 Apr 2018 10:27:52 -0000
@@ -37,7 +37,7 @@
.Nd display status of open files
.Sh SYNOPSIS
.Nm fstat
-.Op Fl fnosv
+.Op Fl fnorsv
.Op Fl M Ar core
.Op Fl N Ar system
.Op Fl p Ar pid
@@ -86,6 +86,8 @@ Useful for checking progress as a proces
This information is only visible to the user or superuser.
.It Fl p Ar pid
Report all files open by the specified process.
+.It Fl r
+Report which rdomain a socket belongs to.
.It Fl s
Report per file io statistics in two additional columns
.Sq XFERS
Index: fstat.c
===================================================================
RCS file: /cvs/src/usr.bin/fstat/fstat.c,v
retrieving revision 1.92
diff -u -p -u -r1.92 fstat.c
--- fstat.c 6 Apr 2018 14:05:06 -0000 1.92
+++ fstat.c 7 Apr 2018 10:27:52 -0000
@@ -98,6 +98,7 @@ int oflg; /* display file offset */
int sflg; /* display file xfer/bytes counters */
int vflg; /* display errors in locating kernel data objects etc... */
int cflg; /* fuser only */
+int rflg; /* display rdomains */
int fuser; /* 1 if we are fuser, 0 if we are fstat */
int signo; /* signal to send (fuser only) */
@@ -148,7 +149,7 @@ main(int argc, char *argv[])
arg = -1;
what = KERN_FILE_BYPID;
nlistf = memf = NULL;
- oflg = 0;
+ rflg = oflg = 0;
/* are we fstat(1) or fuser(1)? */
if (strcmp(__progname, "fuser") == 0) {
@@ -156,7 +157,7 @@ main(int argc, char *argv[])
optstr = "cfks:uM:N:";
} else {
fuser = 0;
- optstr = "fnop:su:vN:M:";
+ optstr = "fnop:rsu:vN:M:";
}
/*
@@ -203,6 +204,9 @@ main(int argc, char *argv[])
}
what = KERN_FILE_BYPID;
break;
+ case 'r':
+ rflg = 1;
+ break;
case 's':
sflg = 1;
if (fuser) {
@@ -737,12 +741,19 @@ socktrans(struct kinfo_file *kf)
*/
switch (kf->so_family) {
case AF_INET:
- printf("* internet %s", stype);
+ if (rflg)
+ printf("* rdomain %u internet %s", kf->inp_rtableid,
stype);
+ else
+ printf("* internet %s", stype);
+
getinetproto(kf->so_protocol);
print_inet_details(kf);
break;
case AF_INET6:
- printf("* internet6 %s", stype);
+ if (rflg)
+ printf("* rdomain %u internet6 %s", kf->inp_rtableid,
stype);
+ else
+ printf("* internet6 %s", stype);
getinetproto(kf->so_protocol);
print_inet6_details(kf);
break;