Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-05-31 14:27:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

6loWPAN: Replace some Rime address naming with more consistent short/exended address terminology

Browse Source
This commit is contained in:
Gregory Nutt
2017-05-04 08:20:59 -06:00
parent 6a45afdd75
commit 969c1ab614
19 changed files with 87 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/sixlowpan/Kconfig
+1 -1
View File
@@ -133,7 +133,7 @@ config NET_6LOWPAN_MAXADDRCONTEXT_PREFIX_2_1
endif # NET_6LOWPAN_MAXADDRCONTEXT_PREINIT_0
endif # NET_6LOWPAN_COMPRESSION_HC06
config NET_6LOWPAN_RIMEADDR_EXTENDED
config NET_6LOWPAN_EXTENDEDADDR
bool "Extended Rime address"
default n
---help---
net/sixlowpan/sixlowpan_framelist.c
+4 -4
View File
@@ -209,13 +209,13 @@ static void sixlowpan_compress_ipv6hdr(FAR const struct ipv6_hdr_s *ipv6hdr,
int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *destip,
FAR const void *buf, size_t buflen,
FAR const struct rimeaddr_s *destmac)
FAR const struct sixlowpan_addr_s *destmac)
{
struct ieee802154_frame_meta_s meta;
FAR struct iob_s *iob;
FAR uint8_t *fptr;
int framer_hdrlen;
struct rimeaddr_s bcastmac;
struct sixlowpan_addr_s bcastmac;
uint16_t pktlen;
uint16_t paysize;
uint16_t dest_panid;
@@ -234,7 +234,7 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
/* Reset rime buffer, packet buffer metatadata */
memset(g_pktattrs, 0, PACKETBUF_NUM_ATTRS * sizeof(uint16_t));
memset(g_pktaddrs, 0, PACKETBUF_NUM_ADDRS * sizeof(struct rimeaddr_s));
memset(g_pktaddrs, 0, PACKETBUF_NUM_ADDRS * sizeof(struct sixlowpan_addr_s));
g_pktattrs[PACKETBUF_ATTR_MAX_MAC_TRANSMISSIONS] =
CONFIG_NET_6LOWPAN_MAX_MACTRANSMITS;
@@ -263,7 +263,7 @@ int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
if (destmac == NULL)
{
memset(&bcastmac, 0, sizeof(struct rimeaddr_s));
memset(&bcastmac, 0, sizeof(struct sixlowpan_addr_s));
destmac = &bcastmac;
}
net/sixlowpan/sixlowpan_framer.c
+5 -5
View File
@@ -83,7 +83,7 @@
static bool sixlowpan_addrnull(FAR uint8_t *addr)
{
int i = NET_6LOWPAN_RIMEADDR_SIZE;
int i = NET_6LOWPAN_ADDRSIZE;
while (i-- > 0)
{
@@ -179,12 +179,12 @@ int sixlowpan_meta_data(uint16_t dest_panid,
{
/* Copy the destination address */
rimeaddr_copy((struct rimeaddr_s *)&meta->dest_addr,
rimeaddr_copy((struct sixlowpan_addr_s *)&meta->dest_addr,
g_pktaddrs[PACKETBUF_ADDR_RECEIVER].u8);
/* Use short destination address mode if so configured */
#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
meta->fcf.dest_addr_mode = FRAME802154_LONGADDRMODE;
#else
meta->fcf.dest_addr_mode = FRAME802154_SHORTADDRMODE;
@@ -193,12 +193,12 @@ int sixlowpan_meta_data(uint16_t dest_panid,
/* Set the source address to the node address assigned to the device */
rimeaddr_copy((struct rimeaddr_s *)&meta->src_addr,
rimeaddr_copy((struct sixlowpan_addr_s *)&meta->src_addr,
&ieee->i_dev.d_mac.ieee802154);
/* Use short soruce address mode if so configured */
#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
meta->fcf.src_addr_mode = FRAME802154_LONGADDRMODE;
#else
meta->fcf.src_addr_mode = FRAME802154_SHORTADDRMODE;
net/sixlowpan/sixlowpan_globals.c
+1 -1
View File
@@ -70,6 +70,6 @@ uint8_t g_frame_hdrlen;
/* Packet buffer metadata: Attributes and addresses */
uint16_t g_pktattrs[PACKETBUF_NUM_ATTRS];
struct rimeaddr_s g_pktaddrs[PACKETBUF_NUM_ADDRS];
struct sixlowpan_addr_s g_pktaddrs[PACKETBUF_NUM_ADDRS];
#endif /* CONFIG_NET_6LOWPAN */
net/sixlowpan/sixlowpan_hc06.c
+7 -7
View File
@@ -233,7 +233,7 @@ static FAR struct sixlowpan_addrcontext_s *
****************************************************************************/
static uint8_t compress_addr_64(FAR const net_ipv6addr_t ipaddr,
FAR const struct rimeaddr_s *macaddr,
FAR const struct sixlowpan_addr_s *macaddr,
uint8_t bitpos)
{
ninfo("ipaddr=%p macaddr=%p bitpos=%u g_hc06ptr=%p\n",
@@ -275,7 +275,7 @@ static uint8_t compress_addr_64(FAR const net_ipv6addr_t ipaddr,
****************************************************************************/
static void uncompress_addr(FAR net_ipv6addr_t ipaddr, uint8_t const prefix[],
uint8_t prefpost, FAR struct rimeaddr_s *macaddr)
uint8_t prefpost, FAR struct sixlowpan_addr_s *macaddr)
{
uint8_t prefcount = prefpost >> 4;
uint8_t postcount = prefpost & 0x0f;
@@ -446,7 +446,7 @@ void sixlowpan_hc06_initialize(void)
void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *ipv6,
FAR const struct rimeaddr_s *destmac,
FAR const struct sixlowpan_addr_s *destmac,
FAR uint8_t *fptr)
{
FAR uint8_t *iphc = fptr + g_frame_hdrlen;
@@ -987,14 +987,14 @@ void sixlowpan_uncompresshdr_hc06(uint16_t iplen, FAR struct iob_s *iob,
uncompress_addr(ipv6->srcipaddr,
tmp != 0 ? addrcontext->prefix : NULL, g_unc_ctxconf[tmp],
(FAR struct rimeaddr_s *)&g_pktaddrs[PACKETBUF_ADDR_SENDER]);
(FAR struct sixlowpan_addr_s *)&g_pktaddrs[PACKETBUF_ADDR_SENDER]);
}
else
{
/* No compression and link local */
uncompress_addr(ipv6->srcipaddr, g_llprefix, g_unc_llconf[tmp],
(FAR struct rimeaddr_s *)&g_pktaddrs[PACKETBUF_ADDR_SENDER]);
(FAR struct sixlowpan_addr_s *)&g_pktaddrs[PACKETBUF_ADDR_SENDER]);
}
/* Destination address */
@@ -1053,14 +1053,14 @@ void sixlowpan_uncompresshdr_hc06(uint16_t iplen, FAR struct iob_s *iob,
}
uncompress_addr(ipv6->destipaddr, addrcontext->prefix, g_unc_ctxconf[tmp],
(FAR struct rimeaddr_s *)&g_pktaddrs[PACKETBUF_ADDR_RECEIVER]);
(FAR struct sixlowpan_addr_s *)&g_pktaddrs[PACKETBUF_ADDR_RECEIVER]);
}
else
{
/* Not address context based => link local M = 0, DAC = 0 - same as SAC */
uncompress_addr(ipv6->destipaddr, g_llprefix, g_unc_llconf[tmp],
(FAR struct rimeaddr_s *)&g_pktaddrs[PACKETBUF_ADDR_RECEIVER]);
(FAR struct sixlowpan_addr_s *)&g_pktaddrs[PACKETBUF_ADDR_RECEIVER]);
}
}
net/sixlowpan/sixlowpan_hc1.c
+1 -1
View File
@@ -120,7 +120,7 @@
void sixlowpan_compresshdr_hc1(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *ipv6,
FAR const struct rimeaddr_s *destmac,
FAR const struct sixlowpan_addr_s *destmac,
FAR uint8_t *fptr)
{
FAR uint8_t *hc1 = fptr + g_frame_hdrlen;
net/sixlowpan/sixlowpan_input.c
+1 -1
View File
@@ -740,7 +740,7 @@ int sixlowpan_input(FAR struct ieee802154_driver_s *ieee,
{
FAR struct ipv6_hdr_s *ipv6hdr;
FAR uint8_t *buffer;
struct rimeaddr_s destmac;
struct sixlowpan_addr_s destmac;
size_t hdrlen;
size_t buflen;
net/sixlowpan/sixlowpan_internal.h
+11 -11
View File
@@ -75,12 +75,12 @@
/* Copy a Rime address */
#define rimeaddr_copy(dest,src) \
memcpy(dest, src, NET_6LOWPAN_RIMEADDR_SIZE)
memcpy(dest, src, NET_6LOWPAN_ADDRSIZE)
/* Compare two Rime addresses */
#define rimeaddr_cmp(addr1,addr2) \
(memcmp(addr1, addr2, NET_6LOWPAN_RIMEADDR_SIZE) == 0)
(memcmp(addr1, addr2, NET_6LOWPAN_ADDRSIZE) == 0)
/* Pointers in the Rime buffer */
@@ -222,7 +222,7 @@ extern uint8_t g_frame_hdrlen;
/* Packet buffer metadata: Attributes and addresses */
extern uint16_t g_pktattrs[PACKETBUF_NUM_ATTRS];
extern struct rimeaddr_s g_pktaddrs[PACKETBUF_NUM_ADDRS];
extern struct sixlowpan_addr_s g_pktaddrs[PACKETBUF_NUM_ADDRS];
/****************************************************************************
* Public Types
@@ -236,7 +236,7 @@ struct net_driver_s; /* Forward reference */
struct ieee802154_driver_s; /* Forward reference */
struct devif_callback_s; /* Forward reference */
struct ipv6_hdr_s; /* Forward reference */
struct rimeaddr_s; /* Forward reference */
struct sixlowpan_addr_s; /* Forward reference */
struct iob_s; /* Forward reference */
/****************************************************************************
@@ -275,7 +275,7 @@ struct iob_s; /* Forward reference */
int sixlowpan_send(FAR struct net_driver_s *dev,
FAR struct devif_callback_s **list,
FAR const struct ipv6_hdr_s *ipv6hdr, FAR const void *buf,
size_t buflen, FAR const struct rimeaddr_s *raddr,
size_t buflen, FAR const struct sixlowpan_addr_s *raddr,
uint16_t timeout);
/****************************************************************************
@@ -381,7 +381,7 @@ int sixlowpan_frame_submit(FAR struct ieee802154_driver_s *ieee,
int sixlowpan_queue_frames(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *ipv6hdr,
FAR const void *buf, size_t buflen,
FAR const struct rimeaddr_s *destmac);
FAR const struct sixlowpan_addr_s *destmac);
/****************************************************************************
* Name: sixlowpan_hc06_initialize
@@ -437,7 +437,7 @@ void sixlowpan_hc06_initialize(void);
#ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC06
void sixlowpan_compresshdr_hc06(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *ipv6,
FAR const struct rimeaddr_s *destmac,
FAR const struct sixlowpan_addr_s *destmac,
FAR uint8_t *fptr);
#endif
@@ -498,7 +498,7 @@ void sixlowpan_uncompresshdr_hc06(uint16_t iplen, FAR struct iob_s *iob,
#ifdef CONFIG_NET_6LOWPAN_COMPRESSION_HC1
void sixlowpan_compresshdr_hc1(FAR struct ieee802154_driver_s *ieee,
FAR const struct ipv6_hdr_s *ipv6,
FAR const struct rimeaddr_s *destmac,
FAR const struct sixlowpan_addr_s *destmac,
FAR uint8_t *fptr);
#endif
@@ -557,12 +557,12 @@ int sixlowpan_uncompresshdr_hc1(uint16_t iplen, FAR struct iob_s *iob,
#define sixlowpan_islinklocal(ipaddr) ((ipaddr)[0] == NTOHS(0xfe80))
void sixlowpan_ipfromrime(FAR const struct rimeaddr_s *rime,
void sixlowpan_ipfromrime(FAR const struct sixlowpan_addr_s *rime,
net_ipv6addr_t ipaddr);
void sixlowpan_rimefromip(const net_ipv6addr_t ipaddr,
FAR struct rimeaddr_s *rime);
FAR struct sixlowpan_addr_s *rime);
bool sixlowpan_ismacbased(const net_ipv6addr_t ipaddr,
FAR const struct rimeaddr_s *rime);
FAR const struct sixlowpan_addr_s *rime);
/****************************************************************************
* Name: sixlowpan_src_panid
net/sixlowpan/sixlowpan_send.c
+2 -2
View File
@@ -83,7 +83,7 @@ struct sixlowpan_send_s
uint16_t s_timeout; /* Send timeout in deciseconds */
systime_t s_time; /* Last send time for determining timeout */
FAR const struct ipv6_hdr_s *s_ipv6hdr; /* IPv6 header, followed by UDP or TCP header. */
FAR const struct rimeaddr_s *s_destmac; /* Destination MAC address */
FAR const struct sixlowpan_addr_s *s_destmac; /* Destination MAC address */
FAR const void *s_buf; /* Data to send */
size_t s_len; /* Length of data in buf */
};
@@ -274,7 +274,7 @@ end_wait:
int sixlowpan_send(FAR struct net_driver_s *dev,
FAR struct devif_callback_s **list,
FAR const struct ipv6_hdr_s *ipv6hdr, FAR const void *buf,
size_t len, FAR const struct rimeaddr_s *destmac,
size_t len, FAR const struct sixlowpan_addr_s *destmac,
uint16_t timeout)
{
struct sixlowpan_send_s sinfo;
net/sixlowpan/sixlowpan_tcpsend.c
+2 -2
View File
@@ -164,7 +164,7 @@ ssize_t psock_6lowpan_tcp_send(FAR struct socket *psock, FAR const void *buf,
FAR struct tcp_conn_s *conn;
FAR struct net_driver_s *dev;
struct ipv6tcp_hdr_s ipv6tcp;
struct rimeaddr_s destmac;
struct sixlowpan_addr_s destmac;
uint16_t timeout;
uint16_t iplen;
int ret;
@@ -409,7 +409,7 @@ void sixlowpan_tcp_send(FAR struct net_driver_s *dev)
}
else
{
struct rimeaddr_s destmac;
struct sixlowpan_addr_s destmac;
FAR uint8_t *buf;
uint16_t hdrlen;
uint16_t buflen;
net/sixlowpan/sixlowpan_udpsend.c
+1 -1
View File
@@ -162,7 +162,7 @@ ssize_t psock_6lowpan_udp_sendto(FAR struct socket *psock,
FAR struct udp_conn_s *conn;
FAR struct net_driver_s *dev;
struct ipv6udp_hdr_s ipv6udp;
struct rimeaddr_s destmac;
struct sixlowpan_addr_s destmac;
uint16_t iplen;
uint16_t timeout;
int ret;
net/sixlowpan/sixlowpan_utils.c
+10 -10
View File
@@ -80,7 +80,7 @@
*
****************************************************************************/
void sixlowpan_ipfromrime(FAR const struct rimeaddr_s *rime,
void sixlowpan_ipfromrime(FAR const struct sixlowpan_addr_s *rime,
net_ipv6addr_t ipaddr)
{
/* We consider only links with IEEE EUI-64 identifier or IEEE 48-bit MAC
@@ -90,13 +90,13 @@ void sixlowpan_ipfromrime(FAR const struct rimeaddr_s *rime,
memset(ipaddr, 0, sizeof(net_ipv6addr_t));
ipaddr[0] = HTONS(0xfe80);
#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
memcpy(&ipaddr[4], rime, NET_6LOWPAN_RIMEADDR_SIZE);
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
memcpy(&ipaddr[4], rime, NET_6LOWPAN_ADDRSIZE);
ipaddr[4] ^= HTONS(0x0200);
#else
ipaddr[5] = HTONS(0x00ff);
ipaddr[6] = HTONS(0xfe00);
memcpy(&ipaddr[7], rime, NET_6LOWPAN_RIMEADDR_SIZE);
memcpy(&ipaddr[7], rime, NET_6LOWPAN_ADDRSIZE);
ipaddr[7] ^= HTONS(0x0200);
#endif
}
@@ -115,16 +115,16 @@ void sixlowpan_ipfromrime(FAR const struct rimeaddr_s *rime,
****************************************************************************/
void sixlowpan_rimefromip(const net_ipv6addr_t ipaddr,
FAR struct rimeaddr_s *rime)
FAR struct sixlowpan_addr_s *rime)
{
/* REVISIT: See notes about 2 byte addresses in sixlowpan_ipfromrime() */
DEBUGASSERT(ipaddr[0] == HTONS(0xfe80));
#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
memcpy(rime, &ipaddr[4], NET_6LOWPAN_RIMEADDR_SIZE);
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
memcpy(rime, &ipaddr[4], NET_6LOWPAN_ADDRSIZE);
#else
memcpy(rime, &ipaddr[7], NET_6LOWPAN_RIMEADDR_SIZE);
memcpy(rime, &ipaddr[7], NET_6LOWPAN_ADDRSIZE);
#endif
rime->u8[0] ^= 0x02;
}
@@ -143,11 +143,11 @@ void sixlowpan_rimefromip(const net_ipv6addr_t ipaddr,
****************************************************************************/
bool sixlowpan_ismacbased(const net_ipv6addr_t ipaddr,
FAR const struct rimeaddr_s *rime)
FAR const struct sixlowpan_addr_s *rime)
{
FAR const uint8_t *rimeptr = rime->u8;
#ifdef CONFIG_NET_6LOWPAN_RIMEADDR_EXTENDED
#ifdef CONFIG_NET_6LOWPAN_EXTENDEDADDR
return (ipaddr[4] == htons((GETINT16(rimeptr, 0) ^ 0x0200)) &&
ipaddr[5] == GETINT16(rimeptr, 2) &&
ipaddr[6] == GETINT16(rimeptr, 4) &&