make-ip-conf.pl fix & Previous Intel eepro100 issues

[Eddie Kohler]

Hi Parveen, Pramod,

Thanks for the make-ip-conf.pl fix. The problem was with CheckIPHeader,
which was supposed to set the destination annotation "if it was not already
set". This worked fine at user level, which explicitly clears the
annotation, but I had forgotten that in the kernel, this annotation is
_not_ cleared. So it was garbage.

I've attached a patch that makes CheckIPHeader and CheckIPHeader2 _always_
set the annotation. This should also fix the problem, making
GetIPAddress(16) unnecessary.

Thanks again!

Eddie


Index: elements/ip/checkipheader.cc
===================================================================
RCS file: /home/butt/click/cvsroot/release/one/elements/ip/checkipheader.cc,v
retrieving revision 1.42
diff -c -r1.42 checkipheader.cc
*** elements/ip/checkipheader.cc	6 Mar 2002 00:29:27 -0000	1.42
--- elements/ip/checkipheader.cc	3 Apr 2002 18:34:35 -0000
***************
*** 185,192 ****
  
    // set destination IP address annotation if it doesn't exist already --
    // 9/26/2001
!   if (!p->dst_ip_anno())
!     p->set_dst_ip_anno(ip->ip_dst);
    
    return(p);
  }
--- 185,192 ----
  
    // set destination IP address annotation if it doesn't exist already --
    // 9/26/2001
!   // always set destination IP address annotation -- 4/3/2002
!   p->set_dst_ip_anno(ip->ip_dst);
    
    return(p);
  }
Index: elements/ip/checkipheader2.cc
===================================================================
RCS file: /home/butt/click/cvsroot/release/one/elements/ip/checkipheader2.cc,v
retrieving revision 1.26
diff -c -r1.26 checkipheader2.cc
*** elements/ip/checkipheader2.cc	8 Feb 2002 00:03:07 -0000	1.26
--- elements/ip/checkipheader2.cc	3 Apr 2002 18:34:36 -0000
***************
*** 120,127 ****
    
    // set destination IP address annotation if it doesn't exist already --
    // 9/26/2001
!   if (!p->dst_ip_anno())
!     p->set_dst_ip_anno(ip->ip_dst);
    
    return(p);
  }
--- 120,127 ----
    
    // set destination IP address annotation if it doesn't exist already --
    // 9/26/2001
!   // always set destination IP address annotation -- 4/3/2002
!   p->set_dst_ip_anno(ip->ip_dst);
    
    return(p);
  }