sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

refactor address encoding, pan id compression was wrong.

Browse Source
This commit is contained in:
Sebastien Lorquet 2015-09-02 15:42:29 +02:00
parent 331571f69c
commit ae88ed1d67
3 changed files with 56 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ieee802154/common/ieee802154_addrstore.c
View File

@ -48,18 +48,20 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
FAR struct ieee802154_addr_s *dest, FAR struct ieee802154_addr_s *dest,
FAR struct ieee802154_addr_s *src) FAR struct ieee802154_addr_s *src)
{ {
int index=3; int index=3; //skip fc and seq
/* encode dest addr */ /* encode dest addr */
if(dest == NULL) if(dest == NULL || dest->ia_len == 0)
{ {
goto nodest; packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_NONE;
} }
if(dest->ia_len == 2) else
{ {
memcpy(packet->data+index, &dest->ia_panid, 2); memcpy(packet->data+index, &dest->ia_panid, 2);
index += 2; /* skip dest pan id */ index += 2; /* skip dest pan id */
if(dest->ia_len == 2)
{
memcpy(packet->data+index, &dest->ia_saddr, 2); memcpy(packet->data+index, &dest->ia_saddr, 2);
index += 2; /* skip dest addr */ index += 2; /* skip dest addr */
packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_SHORT; packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_SHORT;
@ -72,34 +74,36 @@ int ieee802154_addrstore(FAR struct ieee802154_packet_s *packet,
index += 8; /* skip dest addr */ index += 8; /* skip dest addr */
packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_EXT; packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_EXT;
} }
else if(dest->ia_len == 0)
{
nodest:
packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_DADDR) | IEEE802154_DADDR_NONE;
}
else else
{ {
return -EINVAL; return -EINVAL;
} }
}
/* encode source pan id according to compression */ packet->data[0] &= ~IEEE802154_FC1_INTRA;
if( (dest != NULL && dest->ia_len != 0) && (src != NULL && src->ia_len != 0) )
if( (dest != NULL && dest->ia_len != 0) && (src != NULL && src->ia_len != 0) && (dest->ia_panid == src->ia_panid) ) {
/* we have both adresses, encode source pan id according to compression */
if( dest->ia_panid == src->ia_panid)
{ {
packet->data[0] |= IEEE802154_FC1_INTRA; packet->data[0] |= IEEE802154_FC1_INTRA;
} }
else
{
memcpy(packet->data+index, &src->ia_panid, 2);
index += 2; /*skip dest pan id*/
packet->data[0] &= ~IEEE802154_FC1_INTRA;
} }
/* encode source addr */ /* encode source addr */
if(src == NULL) if(src == NULL || src->ia_len==0)
{ {
goto nosrc; packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_SADDR) | IEEE802154_SADDR_NONE;
}
else
{
/*add src pan id if it was not compressed before*/
if(!(packet->data[0] & IEEE802154_FC1_INTRA))
{
memcpy(packet->data+index, &src->ia_panid, 2);
index += 2; /*skip src pan id*/
} }
if(src->ia_len == 2) if(src->ia_len == 2)
{ {
@ -113,15 +117,11 @@ nodest:
index += 8; /* skip src addr */ index += 8; /* skip src addr */
packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_SADDR) | IEEE802154_SADDR_EXT; packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_SADDR) | IEEE802154_SADDR_EXT;
} }
else if(dest->ia_len == 0)
{
nosrc:
packet->data[1] = (packet->data[1] & ~IEEE802154_FC2_SADDR) | IEEE802154_SADDR_NONE;
}
else else
{ {
return -EINVAL; return -EINVAL;
} }
}
return index; return index;
} }

4
ieee802154/coord/coord_main.c
View File

@ -156,7 +156,6 @@ static int coord_command_beacon_req(FAR struct ieee_coord_s *coord)
{ {
FAR struct ieee_frame_s *rx = &coord->rxbuf; FAR struct ieee_frame_s *rx = &coord->rxbuf;
FAR struct ieee802154_packet_s *tx = &coord->txbuf.packet; FAR struct ieee802154_packet_s *tx = &coord->txbuf.packet;
FAR struct ieee802154_addr_s dest;
int i; int i;
printf("Beacon request\n"); printf("Beacon request\n");
@ -175,8 +174,7 @@ static int coord_command_beacon_req(FAR struct ieee_coord_s *coord)
coord->macBSN++; coord->macBSN++;
/* adressing */ /* adressing */
dest.ia_len = 0; /*no dest address*/ tx->len = ieee802154_addrstore(tx, NULL, &coord->addr);
tx->len = ieee802154_addrstore(tx, &dest, &coord->addr);
/* superframe spec */ /* superframe spec */
tx->data[tx->len++] = 0xff; tx->data[tx->len++] = 0xff;

6
ieee802154/i8sak/i8sak_main.c
View File

@ -554,12 +554,6 @@ data_error:
gTxPacket.len = ieee802154_addrstore(&gTxPacket, &dest, NULL); gTxPacket.len = ieee802154_addrstore(&gTxPacket, &dest, NULL);
ieee802154_addrstore(&gTxPacket, &dest, NULL);
gTxPacket.data[gTxPacket.len++] = 0xFF; //panid
gTxPacket.data[gTxPacket.len++] = 0xFF;
gTxPacket.data[gTxPacket.len++] = 0xFF; //saddr
gTxPacket.data[gTxPacket.len++] = 0xFF;
gTxPacket.data[gTxPacket.len++] = IEEE802154_CMD_BEACON_REQ; gTxPacket.data[gTxPacket.len++] = IEEE802154_CMD_BEACON_REQ;
if(!single) if(!single)
{ {