From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
To: "David S. Miller" <davem@redhat.com>
Cc: netdev@oss.sgi.com
Subject: [PATCH] af_unix: Fix path of /proc/net/unix
Date: Sat, 07 Feb 2004 16:03:48 +0900 [thread overview]
Message-ID: <878yjf2wx7.fsf@devron.myhome.or.jp> (raw)
Hi,
/proc/net/unix on 2.4,
c14e0580: 0000000C 00000000 00000000 0002 01 742 /dev/log
c06bfa80: 00000002 00000000 00000000 0002 01 1019617 @0123 ...
/proc/net/unix on 2.6,
c7c85d1c: 0000000C 00000000 00000000 0002 01 1021 /dev/log^@
c551bd5c: 00000002 00000000 00000000 0002 01 5692 ^@0123 ... @
We should overwrite the first "nul" by "@" in the case of abstract
path, otherwise currently "netstat -x" can't print, at least. And
normal one, odd "nul" was added.
This patch does behavior of 2.4. Please apply.
---
net/unix/af_unix.c | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff -puN net/unix/af_unix.c~af_unix-abstruct-fix net/unix/af_unix.c
--- linux-2.6.2/net/unix/af_unix.c~af_unix-abstruct-fix 2004-02-07 01:47:05.000000000 +0900
+++ linux-2.6.2-hirofumi/net/unix/af_unix.c 2004-02-07 03:39:06.000000000 +0900
@@ -1863,14 +1863,19 @@ static int unix_seq_show(struct seq_file
sock_i_ino(s));
if (u->addr) {
- int i;
+ int i, len;
seq_putc(seq, ' ');
-
- for (i = 0; i < u->addr->len-sizeof(short); i++)
- seq_putc(seq, u->addr->name->sun_path[i]);
- if (UNIX_ABSTRACT(s))
+ i = 0;
+ len = u->addr->len - sizeof(short);
+ if (!UNIX_ABSTRACT(s))
+ len--;
+ else {
seq_putc(seq, '@');
+ i++;
+ }
+ for ( ; i < len; i++)
+ seq_putc(seq, u->addr->name->sun_path[i]);
}
unix_state_runlock(s);
seq_putc(seq, '\n');
_
--
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
next reply other threads:[~2004-02-07 7:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-02-07 7:03 OGAWA Hirofumi [this message]
2004-02-08 21:07 ` [PATCH] af_unix: Fix path of /proc/net/unix David S. Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=878yjf2wx7.fsf@devron.myhome.or.jp \
--to=hirofumi@mail.parknet.co.jp \
--cc=davem@redhat.com \
--cc=netdev@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).