deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updated to use uip-ds6

Browse source
This commit is contained in:
nifi 2010-03-19 12:58:17 +00:00
parent 7f7922a10d
commit cba5256ca2
2 changed files with 9 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
tools/sky/uip6-bridge/bridge-conf.h
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: bridge-conf.h,v 1.7 2010/02/18 23:03:36 adamdunkels Exp $ * $Id: bridge-conf.h,v 1.8 2010/03/19 12:58:17 nifi Exp $
*/ */
/** /**
@ -50,9 +50,6 @@
#undef XMAC_CONF_ANNOUNCEMENTS #undef XMAC_CONF_ANNOUNCEMENTS
#define XMAC_CONF_ANNOUNCEMENTS 0 #define XMAC_CONF_ANNOUNCEMENTS 0
#undef RF_CHANNEL
#define RF_CHANNEL 26
#undef UIP_CONF_BUFFER_SIZE #undef UIP_CONF_BUFFER_SIZE
#define UIP_CONF_BUFFER_SIZE 256 #define UIP_CONF_BUFFER_SIZE 256
#endif /* __BRIDGE_CONF_H__ */ #endif /* __BRIDGE_CONF_H__ */

21
tools/sky/uip6-bridge/fakeuip.c
View file

@ -5,7 +5,7 @@
#include "net/uip.h" #include "net/uip.h"
#include "net/uip-netif.h" #include "net/uip-ds6.h"
#include <string.h> #include <string.h>
#define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN]) #define UIP_IP_BUF ((struct uip_ip_hdr *)&uip_buf[UIP_LLH_LEN])
@ -20,12 +20,12 @@ uip_lladdr_t uip_lladdr;
u16_t htons(u16_t val) { return HTONS(val);} u16_t htons(u16_t val) { return HTONS(val);}
struct uip_netif uip_netif_physical_if; uip_ds6_netif_t uip_ds6_if;
/********** UIP_NETIF.c **********/ /********** UIP_DS6.c **********/
void void
uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr) uip_ds6_set_addr_iid(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
{ {
/* We consider only links with IEEE EUI-64 identifier or /* We consider only links with IEEE EUI-64 identifier or
IEEE 48-bit MAC addresses */ IEEE 48-bit MAC addresses */
@ -39,19 +39,14 @@ uip_netif_addr_autoconf_set(uip_ipaddr_t *ipaddr, uip_lladdr_t *lladdr)
memcpy(ipaddr->u8 + 13, lladdr + 3, 3); memcpy(ipaddr->u8 + 13, lladdr + 3, 3);
ipaddr->u8[8] ^= 0x02; ipaddr->u8[8] ^= 0x02;
#else #else
/* #error fakeuip.c cannot build interface address when UIP_LLADDR_LEN is not 6 or 8
UIP_LOG("CAN NOT BUIL INTERFACE IDENTIFIER");
UIP_LOG("THE STACK IS GOING TO SHUT DOWN");
UIP_LOG("THE HOST WILL BE UNREACHABLE");
*/
exit(-1);
#endif #endif
} }
void uip_ds6_addr_t *
uip_netif_addr_add(uip_ipaddr_t *ipaddr, u8_t length, uip_ds6_addr_add(uip_ipaddr_t *ipaddr, unsigned long vlifetime, uint8_t type)
unsigned long vlifetime, uip_netif_type type)
{ {
return NULL;
} }
/********** UIP.c ****************/ /********** UIP.c ****************/