Re: [PATCH] net: ipv4: add IPPROTO_ICMP socket kind

From: Alexey Dobriyan
Date: Wed Apr 13 2011 - 06:29:56 EST


On Sat, Apr 9, 2011 at 1:15 PM, Vasiliy Kulikov <segoon@xxxxxxxxxxxx> wrote:
> This patch adds IPPROTO_ICMP socket kind.

> +       seq_printf(f, "%5d: %08X:%04X %08X:%04X"
> +               " %02X %08X:%08X %02X:%08lX %08X %5d %8d %lu %d %p %d%n",
> +               bucket, src, srcp, dest, destp, sp->sk_state,
> +               sk_wmem_alloc_get(sp),
> +               sk_rmem_alloc_get(sp),
> +               0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),

These zeroes can be embedded into format string for slightly faster printing.

> +static const struct file_operations ping_seq_fops = {
> +       .owner          = THIS_MODULE,

Unnecessary line.
->owner is unused for proc files, this is not documented anywhere, but
it's unused.

> +       .open           = ping_seq_open,
> +       .read           = seq_read,
> +       .llseek         = seq_lseek,
> +       .release        = seq_release_net,
> +};
> +
> +static const char ping_proc_name[] = "icmp";

Ewww :-)
Does not compiler create only one string?

> +static int ping_proc_register(struct net *net)
> +{
> +       struct proc_dir_entry *p;
> +       int rc = 0;
> +
> +       p = proc_create_data(ping_proc_name, S_IRUGO, net->proc_net,
> +                            &ping_seq_fops, NULL);

There is proc_net_fops_create().

> +       if (!p)
> +               rc = -ENOMEM;
> +       return rc;
> +}

> @@ -680,6 +747,15 @@ static struct ctl_table ipv4_net_table[] = {
>                .mode           = 0644,
>                .proc_handler   = proc_dointvec
>        },
> +#ifdef CONFIG_IP_PING
> +       {
> +               .procname       = "ping_group_range",
> +               .data           = &init_net.ipv4.sysctl_ping_group_range,
> +               .maxlen         = sizeof(init_net.ipv4.sysctl_ping_group_range),
> +               .mode           = 0644,
> +               .proc_handler   = ipv4_ping_group_range,
> +       },
> +#endif
>        { }
>  };
>
> @@ -714,8 +790,22 @@ static __net_init int ipv4_sysctl_init_net(struct net *net)
>                        &net->ipv4.sysctl_icmp_ratemask;
>                table[6].data =
>                        &net->ipv4.sysctl_rt_cache_rebuild_count;
> +#ifdef CONFIG_IP_PING
> +               table[7].data =
> +                       &net->ipv4.sysctl_ping_group_range;
> +#endif

Now I understand it's not related, but next sysctl will have
"table[8].data = ..." line which is off-by-one if CONFIG_IP_PING=n.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/