diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-07-14 01:57:00 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-07-14 01:57:00 +0000 |
| commit | c7aa964347c50fccb7335362472cf2ee6f46efc6 (patch) | |
| tree | 86767277147b725f780264854d39a5eddce24c96 /nuttx/include/net/uip | |
| parent | 40b8aea75434f8fa73fae718cfa48af87cb01547 (diff) | |
| download | px4-nuttx-c7aa964347c50fccb7335362472cf2ee6f46efc6.tar.gz px4-nuttx-c7aa964347c50fccb7335362472cf2ee6f46efc6.tar.bz2 px4-nuttx-c7aa964347c50fccb7335362472cf2ee6f46efc6.zip | |
Outgoing IGMP is functional
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2797 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include/net/uip')
| -rwxr-xr-x | nuttx/include/net/uip/uip-igmp.h | 1 | ||||
| -rwxr-xr-x | nuttx/include/net/uip/uip-ipopt.h | 16 | ||||
| -rw-r--r-- | nuttx/include/net/uip/uip.h | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/nuttx/include/net/uip/uip-igmp.h b/nuttx/include/net/uip/uip-igmp.h index 58ca7565e..29a3d5334 100755 --- a/nuttx/include/net/uip/uip-igmp.h +++ b/nuttx/include/net/uip/uip-igmp.h @@ -110,7 +110,6 @@ #define IS_SCHEDMSG(f) (((f) & IGMP_SCHEDMSG) != 0) #define IS_WAITMSG(f) (((f) & IGMP_WAITMSG) != 0) -#define ROUTER_ALERT 0x94040000 #define IGMP_TTL 1 /**************************************************************************** diff --git a/nuttx/include/net/uip/uip-ipopt.h b/nuttx/include/net/uip/uip-ipopt.h index d4c3aebe3..1625fbab6 100755 --- a/nuttx/include/net/uip/uip-ipopt.h +++ b/nuttx/include/net/uip/uip-ipopt.h @@ -75,8 +75,8 @@ # define IPOPT_TYPE_OPTION_SEC (2 << IPOPT_TYPE_OPTION_SHIFT) /* Security (RFC 791, 1108) */ # define IPOPT_TYPE_OPTION_LSRR (3 << IPOPT_TYPE_OPTION_SHIFT) /* Loose source and record route (RFC 791) */ # define IPOPT_TYPE_OPTION_TIMESTAMP (4 << IPOPT_TYPE_OPTION_SHIFT) /* Timestamp (RFC 781, 791) */ -# define IPORT_TYPE_OPTION_EXTSEC (5 << IPOPT_TYPE_OPTION_SHIFT) /* Extended security (RFC 1108) */ -# define IPORT_TYPE_OPTION_COMMSEC (6 << IPOPT_TYPE_OPTION_SHIFT) /* Commercial security */ +# define IPOPT_TYPE_OPTION_EXTSEC (5 << IPOPT_TYPE_OPTION_SHIFT) /* Extended security (RFC 1108) */ +# define IPOPT_TYPE_OPTION_COMMSEC (6 << IPOPT_TYPE_OPTION_SHIFT) /* Commercial security */ # define IPOPT_TYPE_OPTION_RR (7 << IPOPT_TYPE_OPTION_SHIFT) /* Record route (RFC 791) */ # define IPOPT_TYPE_OPTION_SSID (8 << IPOPT_TYPE_OPTION_SHIFT) /* Stream ID (RFC 791, 1122) */ # define IPOPT_TYPE_OPTION_SSRR (9 << IPOPT_TYPE_OPTION_SHIFT) /* Strict source and record route (RFC 791) */ @@ -110,7 +110,7 @@ #define IPOPT_MKOPTION8(copied,class,option) \ ((uint8_t)IPOPT_MKTYPE(copied,class,option)) #define IPOPT_MKOPTION32(type,len,ptr,data) \ - ((uint32_t)(type) << 24 | (uint32_t)(len) << 16) | \ + ((uint32_t)(type) << 24 | (uint32_t)(len) << 16 | \ (uint32_t)(ptr) << 8 | (uint32_t)(data)) /* Option Copy Class Length Description References @@ -169,11 +169,11 @@ #define IPOPT_TIMESTAMP_TYPE \ IPOPT_MKTYPE(IPOPT_TYPE_NOTCOPIED, IPOPT_TYPE_CLASS_MEASURE, IPOPT_TYPE_OPTION_TIMESTAMP) -#define IPORT_EXTSEC_TYPE \ - IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPORT_TYPE_OPTION_EXTSEC) +#define IPOPT_EXTSEC_TYPE \ + IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPOPT_TYPE_OPTION_EXTSEC) -#define IPORT_COMMSEC_TYPE \ - IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPORT_TYPE_OPTION_COMMSEC) +#define IPOPT_COMMSEC_TYPE \ + IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPOPT_TYPE_OPTION_COMMSEC) #define IPOPT_RR_TYPE \ IPOPT_MKTYPE(IPOPT_TYPE_NOTCOPIED, IPOPT_TYPE_CLASS_CTRL, IPOPT_TYPE_OPTION_RR) @@ -222,7 +222,7 @@ #define IPOPT_RA_TYPE \ IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPOPT_TYPE_OPTION_RA) #define IPOPT_RA \ - IPOPT_MKOPTION32(IPORT_RA_TYPE, 4, 0, 0) + IPOPT_MKOPTION32(IPOPT_RA_TYPE, 4, 0, 0) #define IPOPT_SDBM_TYPE \ IPOPT_MKTYPE(IPOPT_TYPE_COPIED, IPOPT_TYPE_CLASS_CTRL, IPOPT_TYPE_OPTION_SDBM) diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h index fd9373666..a828d3f90 100644 --- a/nuttx/include/net/uip/uip.h +++ b/nuttx/include/net/uip/uip.h @@ -442,7 +442,7 @@ extern void uip_send(struct uip_driver_s *dev, const void *buf, int len); * uip_ipaddr_t ipaddr1, ipaddr2; * * uip_ipaddr(&ipaddr1, 192,16,1,2); - * if(uip_ipaddr_cmp(&ipaddr2, &ipaddr1)) { + * if(uip_ipaddr_cmp(ipaddr2, ipaddr1)) { * printf("They are the same"); * } * |