Hi,

</snip>

>     yes, you are right. below is updated diff I would like to commit.
> >
> > Appart from that, adding a special task seems the way to go.
>
>     I think so too. Alternative way would be to pass send flags via m_pkthdr
>     in mbuf, however there is no space. We would have to add a new member
>     to m_pkthdr. I see such change as too intrusive (given we address a true
>     corner case).

I just wanted to reply, but you beat me to it :)
I think the changes in ip_insertoptions() can be dropped completely,
because the if-statement uses ip-ip_hl, which might not be initialized.

Also, in icmp_send(), ip_insertoptions() might return a different mbuf
pointer. Thus, the struct ip pointer must be updated as well, right?
block for refrence (Whole diff below):

if (opts != NULL) {
        m = ip_insertoptions(m, opts, &hlen);
        ip = mtod(m, struct ip *);

        ip->ip_v = IPVERSION;
        ip->ip_off &= htons(IP_DF);
        ip->ip_id = htons(ip_randomid());
        ip->ip_hl = hlen >> 2;
        ipstat_inc(ips_localout);
        ip_send_raw(m);
}

Regards
Dominik

diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index a007aa6c2b3..8eb1c9b30e8 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -846,10 +846,22 @@ icmp_send(struct mbuf *m, struct mbuf *opts)
                printf("icmp_send dst %s src %s\n", dst, src);
        }
 #endif
-       if (opts != NULL)
+       /*
+        * ip_send() cannot handle ip options properly. So in case we have
+        * options fill out the ip header here and use ip_send_raw() instead.
+        */
+       if (opts != NULL) {
                m = ip_insertoptions(m, opts, &hlen);
-
-       ip_send(m);
+               ip = mtod(m, struct ip *);
+
+               ip->ip_v = IPVERSION;
+               ip->ip_off &= htons(IP_DF);
+               ip->ip_id = htons(ip_randomid());
+               ip->ip_hl = hlen >> 2;
+               ipstat_inc(ips_localout);
+               ip_send_raw(m);
+       } else
+               ip_send(m);
 }

 u_int32_t
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 0ec3f723be4..bfc700dee84 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -139,6 +139,7 @@ struct cpumem *ipcounters;
 int ip_sysctl_ipstat(void *, size_t *, void *);

 static struct mbuf_queue       ipsend_mq;
+static struct mbuf_queue       ipsendraw_mq;

 extern struct niqueue          arpinq;

@@ -147,7 +148,12 @@ int        ip_dooptions(struct mbuf *, struct ifnet *);
 int    in_ouraddr(struct mbuf *, struct ifnet *, struct rtentry **);

 static void ip_send_dispatch(void *);
+static void ip_sendraw_dispatch(void *);
+static void ip_send_do_dispatch(void *, int);
 static struct task ipsend_task = TASK_INITIALIZER(ip_send_dispatch, 
&ipsend_mq);
+static struct task ipsendraw_task =
+       TASK_INITIALIZER(ip_sendraw_dispatch, &ipsendraw_mq);
+
 /*
  * Used to save the IP options in case a protocol wants to respond
  * to an incoming packet over the same route if the packet got here
@@ -217,6 +223,7 @@ ip_init(void)
                DP_SET(rootonlyports.udp, defrootonlyports_udp[i]);

        mq_init(&ipsend_mq, 64, IPL_SOFTNET);
+       mq_init(&ipsendraw_mq, 64, IPL_SOFTNET);

 #ifdef IPSEC
        ipsec_init();
@@ -1777,7 +1784,7 @@ ip_savecontrol(struct inpcb *inp, struct mbuf **mp, 
struct ip *ip,
 }

 void
-ip_send_dispatch(void *xmq)
+ip_send_do_dispatch(void *xmq, int flags)
 {
        struct mbuf_queue *mq = xmq;
        struct mbuf *m;
@@ -1789,14 +1796,33 @@ ip_send_dispatch(void *xmq)

        NET_LOCK();
        while ((m = ml_dequeue(&ml)) != NULL) {
-               ip_output(m, NULL, NULL, 0, NULL, NULL, 0);
+               ip_output(m, NULL, NULL, flags, NULL, NULL, 0);
        }
        NET_UNLOCK();
 }

+void
+ip_sendraw_dispatch(void *xmq)
+{
+       ip_send_do_dispatch(xmq, IP_RAWOUTPUT);
+}
+
+void
+ip_send_dispatch(void *xmq)
+{
+       ip_send_do_dispatch(xmq, 0);
+}
+
 void
 ip_send(struct mbuf *m)
 {
        mq_enqueue(&ipsend_mq, m);
        task_add(net_tq(0), &ipsend_task);
 }
+
+void
+ip_send_raw(struct mbuf *m)
+{
+       mq_enqueue(&ipsendraw_mq, m);
+       task_add(net_tq(0), &ipsendraw_task);
+}
diff --git a/sys/netinet/ip_var.h b/sys/netinet/ip_var.h
index 7ede24ce922..1a43675a7ac 100644
--- a/sys/netinet/ip_var.h
+++ b/sys/netinet/ip_var.h
@@ -240,6 +240,7 @@ struct mbuf *
 u_int16_t
         ip_randomid(void);
 void    ip_send(struct mbuf *);
+void    ip_send_raw(struct mbuf *);
 void    ip_slowtimo(void);
 struct mbuf *
         ip_srcroute(struct mbuf *);

Reply via email to