Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 78166
b: refs/heads/master
c: 42a7380
h: refs/heads/master
v: v3
  • Loading branch information
Pavel Emelyanov authored and David S. Miller committed Jan 28, 2008
1 parent 670d62b commit 616a3cf
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 96 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ab70768ec78c6784958bab3b58fbe3f4150006df
refs/heads/master: 42a73808ed4f30b739eb52bcbb33a02fe62ceef5
14 changes: 14 additions & 0 deletions trunk/include/net/raw.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,20 @@ struct raw_hashinfo {
#ifdef CONFIG_PROC_FS
extern int raw_proc_init(void);
extern void raw_proc_exit(void);

struct raw_iter_state {
int bucket;
unsigned short family;
struct raw_hashinfo *h;
};

#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)
void *raw_seq_start(struct seq_file *seq, loff_t *pos);
void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos);
void raw_seq_stop(struct seq_file *seq, void *v);
int raw_seq_open(struct file *file, struct raw_hashinfo *h,
unsigned short family);

#endif

void raw_hash_sk(struct sock *sk, struct raw_hashinfo *h);
Expand Down
52 changes: 34 additions & 18 deletions trunk/net/ipv4/raw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -845,12 +845,6 @@ struct proto raw_prot = {
};

#ifdef CONFIG_PROC_FS
struct raw_iter_state {
int bucket;
};

#define raw_seq_private(seq) ((struct raw_iter_state *)(seq)->private)

static struct sock *raw_get_first(struct seq_file *seq)
{
struct sock *sk;
Expand All @@ -860,8 +854,8 @@ static struct sock *raw_get_first(struct seq_file *seq)
++state->bucket) {
struct hlist_node *node;

sk_for_each(sk, node, &raw_v4_hashinfo.ht[state->bucket])
if (sk->sk_family == PF_INET)
sk_for_each(sk, node, &state->h->ht[state->bucket])
if (sk->sk_family == state->family)
goto found;
}
sk = NULL;
Expand All @@ -877,10 +871,10 @@ static struct sock *raw_get_next(struct seq_file *seq, struct sock *sk)
sk = sk_next(sk);
try_again:
;
} while (sk && sk->sk_family != PF_INET);
} while (sk && sk->sk_family != state->family);

if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&raw_v4_hashinfo.ht[state->bucket]);
sk = sk_head(&state->h->ht[state->bucket]);
goto try_again;
}
return sk;
Expand All @@ -896,13 +890,16 @@ static struct sock *raw_get_idx(struct seq_file *seq, loff_t pos)
return pos ? NULL : sk;
}

static void *raw_seq_start(struct seq_file *seq, loff_t *pos)
void *raw_seq_start(struct seq_file *seq, loff_t *pos)
{
read_lock(&raw_v4_hashinfo.lock);
struct raw_iter_state *state = raw_seq_private(seq);

read_lock(&state->h->lock);
return *pos ? raw_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
}
EXPORT_SYMBOL_GPL(raw_seq_start);

static void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *sk;

Expand All @@ -913,11 +910,15 @@ static void *raw_seq_next(struct seq_file *seq, void *v, loff_t *pos)
++*pos;
return sk;
}
EXPORT_SYMBOL_GPL(raw_seq_next);

static void raw_seq_stop(struct seq_file *seq, void *v)
void raw_seq_stop(struct seq_file *seq, void *v)
{
read_unlock(&raw_v4_hashinfo.lock);
struct raw_iter_state *state = raw_seq_private(seq);

read_unlock(&state->h->lock);
}
EXPORT_SYMBOL_GPL(raw_seq_stop);

static __inline__ char *get_raw_sock(struct sock *sp, char *tmpbuf, int i)
{
Expand Down Expand Up @@ -964,15 +965,30 @@ static const struct seq_operations raw_seq_ops = {
.show = raw_seq_show,
};

static int raw_seq_open(struct inode *inode, struct file *file)
int raw_seq_open(struct file *file, struct raw_hashinfo *h,
unsigned short family)
{
return seq_open_private(file, &raw_seq_ops,
struct raw_iter_state *i;

i = __seq_open_private(file, &raw_seq_ops,
sizeof(struct raw_iter_state));
if (i == NULL)
return -ENOMEM;

i->h = h;
i->family = family;
return 0;
}
EXPORT_SYMBOL_GPL(raw_seq_open);

static int raw_v4_seq_open(struct inode *inode, struct file *file)
{
return raw_seq_open(file, &raw_v4_hashinfo, PF_INET);
}

static const struct file_operations raw_seq_fops = {
.owner = THIS_MODULE,
.open = raw_seq_open,
.open = raw_v4_seq_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
Expand Down
82 changes: 5 additions & 77 deletions trunk/net/ipv6/raw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1200,77 +1200,6 @@ struct proto rawv6_prot = {
};

#ifdef CONFIG_PROC_FS
struct raw6_iter_state {
int bucket;
};

#define raw6_seq_private(seq) ((struct raw6_iter_state *)(seq)->private)

static struct sock *raw6_get_first(struct seq_file *seq)
{
struct sock *sk;
struct hlist_node *node;
struct raw6_iter_state* state = raw6_seq_private(seq);

for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE;
++state->bucket)
sk_for_each(sk, node, &raw_v6_hashinfo.ht[state->bucket])
if (sk->sk_family == PF_INET6)
goto out;
sk = NULL;
out:
return sk;
}

static struct sock *raw6_get_next(struct seq_file *seq, struct sock *sk)
{
struct raw6_iter_state* state = raw6_seq_private(seq);

do {
sk = sk_next(sk);
try_again:
;
} while (sk && sk->sk_family != PF_INET6);

if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
sk = sk_head(&raw_v6_hashinfo.ht[state->bucket]);
goto try_again;
}
return sk;
}

static struct sock *raw6_get_idx(struct seq_file *seq, loff_t pos)
{
struct sock *sk = raw6_get_first(seq);
if (sk)
while (pos && (sk = raw6_get_next(seq, sk)) != NULL)
--pos;
return pos ? NULL : sk;
}

static void *raw6_seq_start(struct seq_file *seq, loff_t *pos)
{
read_lock(&raw_v6_hashinfo.lock);
return *pos ? raw6_get_idx(seq, *pos - 1) : SEQ_START_TOKEN;
}

static void *raw6_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{
struct sock *sk;

if (v == SEQ_START_TOKEN)
sk = raw6_get_first(seq);
else
sk = raw6_get_next(seq, v);
++*pos;
return sk;
}

static void raw6_seq_stop(struct seq_file *seq, void *v)
{
read_unlock(&raw_v6_hashinfo.lock);
}

static void raw6_sock_seq_show(struct seq_file *seq, struct sock *sp, int i)
{
struct ipv6_pinfo *np = inet6_sk(sp);
Expand Down Expand Up @@ -1308,21 +1237,20 @@ static int raw6_seq_show(struct seq_file *seq, void *v)
"st tx_queue rx_queue tr tm->when retrnsmt"
" uid timeout inode drops\n");
else
raw6_sock_seq_show(seq, v, raw6_seq_private(seq)->bucket);
raw6_sock_seq_show(seq, v, raw_seq_private(seq)->bucket);
return 0;
}

static const struct seq_operations raw6_seq_ops = {
.start = raw6_seq_start,
.next = raw6_seq_next,
.stop = raw6_seq_stop,
.start = raw_seq_start,
.next = raw_seq_next,
.stop = raw_seq_stop,
.show = raw6_seq_show,
};

static int raw6_seq_open(struct inode *inode, struct file *file)
{
return seq_open_private(file, &raw6_seq_ops,
sizeof(struct raw6_iter_state));
return raw_seq_open(file, &raw_v6_hashinfo, PF_INET6);
}

static const struct file_operations raw6_seq_fops = {
Expand Down

0 comments on commit 616a3cf

Please sign in to comment.