fix ip packet forwarding to not stomp on headers when fragmented;

[unix-history] / usr / src / sys / netinet / ip_icmp.c

diff --git a/usr/src/sys/netinet/ip_icmp.c b/usr/src/sys/netinet/ip_icmp.c
index af7282d..5f46b42 100644 (file)
--- a/usr/src/sys/netinet/ip_icmp.c
+++ b/usr/src/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/*     ip_icmp.c       4.29    83/03/10        */
+/*     ip_icmp.c       4.31    83/05/01        */

 
 #include "../h/param.h"
 #include "../h/systm.h"
 
 #include "../h/param.h"
 #include "../h/systm.h"


@@ -155,7 +155,6 @@ icmp_input(m)
        case ICMP_UNREACH:
        case ICMP_TIMXCEED:
        case ICMP_PARAMPROB:
        case ICMP_UNREACH:
        case ICMP_TIMXCEED:
        case ICMP_PARAMPROB:

-       case ICMP_REDIRECT:

        case ICMP_SOURCEQUENCH:
                /*
                 * Problem with previous datagram; advise
        case ICMP_SOURCEQUENCH:
                /*
                 * Problem with previous datagram; advise


@@ -191,6 +190,7 @@ icmp_input(m)
                /* fill in source address zero fields! */
                goto reflect;
 
                /* fill in source address zero fields! */
                goto reflect;
 

+       case ICMP_REDIRECT:

        case ICMP_ECHOREPLY:
        case ICMP_TSTAMPREPLY:
        case ICMP_IREQREPLY:
        case ICMP_ECHOREPLY:
        case ICMP_TSTAMPREPLY:
        case ICMP_IREQREPLY:


@@ -198,11 +198,24 @@ icmp_input(m)
                        icmpstat.icps_badlen++;
                        goto free;
                }
                        icmpstat.icps_badlen++;
                        goto free;
                }

+               /*
+                * Short circuit routing redirects to force
+                * immediate change in the kernel's routing
+                * tables.  The message is also handed to anyone
+                * listening on a raw socket (e.g. the routing
+                * daemon for use in updating it's tables).
+                */
+               if (icp->icmp_type == ICMP_REDIRECT) {
+                       icmpsrc.sin_addr = icp->icmp_ip.ip_dst;
+                       icmpdst.sin_addr = icp->icmp_gwaddr;
+                       rtredirect((struct sockaddr *)&icmpsrc,
+                         (struct sockaddr *)&icmpdst);
+               }

                icmpsrc.sin_addr = ip->ip_src;
                icmpdst.sin_addr = ip->ip_dst;
                raw_input(dtom(icp), &icmproto, (struct sockaddr *)&icmpsrc,
                  (struct sockaddr *)&icmpdst);
                icmpsrc.sin_addr = ip->ip_src;
                icmpdst.sin_addr = ip->ip_dst;
                raw_input(dtom(icp), &icmproto, (struct sockaddr *)&icmpsrc,
                  (struct sockaddr *)&icmpdst);

-               goto free;
+               return;

 
        default:
                goto free;
 
        default:
                goto free;