[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <CAA=3Oq=Kxfe8KKnWV7QjLnT1Art3UEMJBTE=tXBLZPa6diug6g@mail.gmail.com>
Date: Wed, 18 Sep 2013 09:50:31 -0700
From: Ansis Atteka <aatteka@...ira.com>
To: David Miller <davem@...emloft.net>
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH net] ip: generate unique IP identificator if local
fragmentation is allowed
On Wed, Sep 18, 2013 at 9:20 AM, David Miller <davem@...emloft.net> wrote:
> From: Ansis Atteka <aatteka@...ira.com>
> Date: Tue, 17 Sep 2013 15:25:00 -0700
>
>> @@ -1317,6 +1317,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
>> ttl = ip_select_ttl(inet, &rt->dst);
>>
>> iph = (struct iphdr *)skb->data;
>> +
>> iph->version = 4;
>> iph->ihl = 5;
>> iph->tos = inet->tos;
>> @@ -1324,7 +1325,7 @@ struct sk_buff *__ip_make_skb(struct sock *sk,
>> iph->ttl = ttl;
>> iph->protocol = sk->sk_protocol;
>> ip_copy_addrs(iph, fl4);
>> - ip_select_ident(iph, &rt->dst, sk);
>> + ip_select_ident(skb, &rt->dst, sk);
>>
>> if (opt) {
>> iph->ihl += opt->optlen>>2;
>
> This transformation is not equivalent.
>
> ip_select_ident() is going to use ip_hdr() which obtains the header
> pointer via skb_network_header().
>
> But here, the code is using skb->data for this, which is different.
I dared to do that because three lines below ip_options_build() seems
to be already doing the same thing, if IP options are present:
struct sk_buff *__ip_make_skb() {
...
ip_select_ident(skb, &rt->dst, sk);
if (opt) {
iph->ihl += opt->optlen>>2;
ip_options_build(skb, opt, cork->addr, rt, 0);
}
and
void ip_options_build(struct sk_buff *skb, struct ip_options *opt,
__be32 daddr, struct rtable *rt, int is_frag) {
unsigned char *iph = skb_network_header(skb);
....
Another solution would be to pass local fragmentation flag as fourth
argument to ip_select_ident(). If you think that would be cleaner,
then I can reimplement it that way?
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists