nistnet build problems

I've bumped into a few people who are having trouble building the
NistNet network simulation tool on newer 2.4 kernels (I haven't tried it
on 2.6's) and/or with gcc >3.0

Here's a patch that works for me (provided as-is, your mileage may vary...)

--Shai


*** nistnet/include/nistnet.h 2001-07-23 12:24:18.000000000 -0700
--- nistnet-shai/include/nistnet.h 2004-05-03 14:24:02.000000000 -0700
***************
*** 158,165 ****
#ifdef __KERNEL__
#include <net/protocol.h>
#endif
- #include <linux/igmp.h>
#endif

struct lin_mungestats {
struct iphdr ip;
--- 158,165 ----
#ifdef __KERNEL__
#include <net/protocol.h>
#endif
#endif
+ #include <linux/igmp.h>

struct lin_mungestats {
struct iphdr ip;
*** nistnet/cli/hitbox.c 2001-01-23 16:06:08.000000000 -0800
--- nistnet-shai/cli/hitbox.c 2004-05-03 14:43:39.000000000 -0700
***************
*** 174,194 ****
void
Usage(void)
{
! fprintf(stderr, "Usage: hitbox\n\
! -u up (on)\n\
! -d down (off)\n\
#ifdef CONFIG_ECN
! -a src dest delay delsigma bandwidth drop dup drdmin drdmax drdcongestion add new\n\
#else
! -a src dest delay delsigma bandwidth drop dup drdmin drdmax add new\n\
#endif
! -r src dest remove\n\
! -s src dest see stats\n\
! -S src dest see stats continuously\n\
! -R read table\n\
! -D debug on\n\
! -U debug off\n\
! -G global stats\n");
exit(1);
}

--- 174,194 ----
void
Usage(void)
{
! fprintf(stderr, "Usage: hitbox\n"
! " -u up (on)\n"
! " -d down (off)\n"
#ifdef CONFIG_ECN
! " -a src dest delay delsigma bandwidth drop dup drdmin drdmax drdcongestion add new\n"
#else
! " -a src dest delay delsigma bandwidth drop dup drdmin drdmax add new\n"
#endif
! " -r src dest remove\n"
! " -s src dest see stats\n"
! " -S src dest see stats continuously\n"
! " -R read table\n"
! " -D debug on\n"
! " -U debug off\n"
! " -G global stats\n");
exit(1);
}