Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rework the Contiki network address cache #307

Merged
merged 2 commits into from
Dec 22, 2016
Merged

Rework the Contiki network address cache #307

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5ba1c2d
Rework the Contiki network address cache to compare using parsed addr…
mtusnio Dec 16, 2016
8580cdc
Merge branch 'master' into cache
cheekyhalf Dec 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
125 changes: 36 additions & 89 deletions core/src/common/network_abstraction_contiki.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ struct _NetworkSocket
typedef struct
{
bool InUse;
char Uri[MAX_URI_LENGTH];
NetworkAddress Address;
} NetworkAddressCache;

Expand All @@ -80,10 +79,9 @@ static NetworkSocket networkSocket;

static NetworkAddressCache networkAddressCache[MAX_NETWORK_ADDRESS_CACHE] = {{0}};

static NetworkAddress * addCachedAddress(const char * uri, int uriLength);
static NetworkAddress * getCachedAddress(NetworkAddress * matchAddress, const char * uri, int uriLength);
static NetworkAddress * getCachedAddressByUri(const char * uri, int uriLength);
static int getUriHostLength(const char * uri, int uriLength);
// Both functions require the port to be in network format
static NetworkAddress * addCachedAddress(const uip_ipaddr_t * addr, uint16_t port, bool secure);
static NetworkAddress * getCachedAddress(const uip_ipaddr_t * addr, uint16_t port);

#ifndef ENCRYPT_BUFFER_LENGTH
#define ENCRYPT_BUFFER_LENGTH 1024
Expand Down Expand Up @@ -147,9 +145,6 @@ NetworkAddress * NetworkAddress_New(const char * uri, int uriLength)
NetworkAddress * result = NULL;
if (uri && uriLength > 0)
{
int uriHostLength = getUriHostLength(uri, uriLength);
if (uriHostLength > 0)
result = getCachedAddressByUri(uri, uriHostLength);
if (!result)
{
bool secure = false;
Expand Down Expand Up @@ -238,20 +233,28 @@ NetworkAddress * NetworkAddress_New(const char * uri, int uriLength)
if (hostnameLength > 0 && port > 0)
{
uip_ipaddr_t * resolvedAddress = getHostByName(hostname);
port = UIP_HTONS(port);

if (resolvedAddress)
{
NetworkAddress * networkAddress = addCachedAddress(uri, uriHostLength);
NetworkAddress * networkAddress = getCachedAddress(resolvedAddress, port);

if(!networkAddress)
{
networkAddress = addCachedAddress(resolvedAddress, port, secure);
}

if (networkAddress)
{
memcpy(&networkAddress->Address, resolvedAddress, sizeof(uip_ipaddr_t));
networkAddress->Secure = secure;
networkAddress->useCount = 1;
networkAddress->Port = UIP_HTONS(port);
result = networkAddress;
}
}
}
}
if(result)
{
result->useCount++;
}
}
return result;
}
Expand Down Expand Up @@ -294,15 +297,7 @@ void NetworkAddress_Free(NetworkAddress ** address)
{
if (NetworkAddress_Compare(&networkAddressCache[index].Address, *address) == 0)
{
if (networkAddressCache[index].Uri)
{
Lwm2m_Debug("Address free: %s\n", networkAddressCache[index].Uri);
networkAddressCache[index].Uri[0] = '\0';
}
else
{
Lwm2m_Debug("Address free\n");
}
Lwm2m_Debug("Address free\n");
networkAddressCache[index].InUse = false;
break;
}
Expand All @@ -322,65 +317,44 @@ bool NetworkAddress_IsSecure(const NetworkAddress * address)
return result;
}

static NetworkAddress * addCachedAddress(const char * uri, int uriLength)
static NetworkAddress * addCachedAddress(const uip_ipaddr_t * addr, uint16_t port, bool secure)
{
NetworkAddress * result = NULL;
int index;
for (index = 0; index < MAX_NETWORK_ADDRESS_CACHE; index++)
{
if (!networkAddressCache[index].InUse)
{
if (uri && uriLength > 0)
{
memcpy(networkAddressCache[index].Uri, uri, uriLength);
networkAddressCache[index].Uri[uriLength] = 0;
Lwm2m_Debug("Address add: %s\n", networkAddressCache[index].Uri);
}
NetworkAddress * networkAddress = &networkAddressCache[index].Address;

networkAddressCache[index].InUse = true;
memcpy(&networkAddress->Address, addr, sizeof(uip_ipaddr_t));
networkAddress->Port = port;
networkAddress->Secure = secure;
networkAddress->useCount = 1;
result = &networkAddressCache[index].Address;
break;
}
}
return result;
}



static NetworkAddress * getCachedAddressByUri(const char * uri, int uriLength)
static NetworkAddress * getCachedAddress(const uip_ipaddr_t * addr, uint16_t port)
{
NetworkAddress * result = NULL;
NetworkAddress matchAddress;
int index;
for (index = 0; index < MAX_NETWORK_ADDRESS_CACHE; index++)
{
if (networkAddressCache[index].Uri && (memcmp(networkAddressCache[index].Uri, uri, uriLength) == 0))
{
//Lwm2m_Debug("Address uri matched: %s\n", networkAddressCache[index].uri);
result = &networkAddressCache[index].Address;
break;
}
}
return result;
}

static NetworkAddress * getCachedAddress(NetworkAddress * matchAddress, const char * uri, int uriLength)
{
NetworkAddress * result = NULL;
int index;
memcpy(&matchAddress.Address, addr, sizeof(uip_ipaddr_t));
matchAddress.Port = port;

for (index = 0; index < MAX_NETWORK_ADDRESS_CACHE; index++)
{
NetworkAddress * address = &networkAddressCache[index].Address;
if (address)
{
if (NetworkAddress_Compare(matchAddress, address) == 0)
if (NetworkAddress_Compare(&matchAddress, address) == 0)
{
if (uri && uriLength > 0 && networkAddressCache[index].Uri == NULL)
{
// Add info to cached address
address->Secure = matchAddress->Secure;
memcpy(networkAddressCache[index].Uri, uri, uriLength);
networkAddressCache[index].Uri[uriLength] = 0;
Lwm2m_Debug("Address add uri: %s\n", networkAddressCache[index].Uri);
}
result = address;
break;
}
Expand All @@ -389,28 +363,6 @@ static NetworkAddress * getCachedAddress(NetworkAddress * matchAddress, const ch
return result;
}

static int getUriHostLength(const char * uri, int uriLength)
{
// Search for end of host + optional port
int result = uriLength;
char * pathStart = memchr(uri, '/', uriLength);
if (pathStart && pathStart[1] == '/' )
{
pathStart += 2;
int lengthRemaining = uriLength - (pathStart - uri);
if (lengthRemaining > 0)
{
pathStart = memchr(pathStart, '/', lengthRemaining);
if (pathStart)
{
result = pathStart - uri;
}
}
}
return result;
}


NetworkSocket * NetworkSocket_New(const char * ipAddress, NetworkSocketType socketType, uint16_t port)
{
size_t size = sizeof(struct _NetworkSocket);
Expand Down Expand Up @@ -488,23 +440,18 @@ bool readUDP(NetworkSocket * networkSocket, uint8_t * buffer, int bufferLength,
}
if (*readLength > 0)
{
uip_ipaddr_t * address = &UIP_IP_BUF->srcipaddr;
uint16_t port = UIP_IP_BUF->srcport;
bool secure = (networkSocket->SocketType & NetworkSocketType_Secure) == NetworkSocketType_Secure;

memcpy(buffer, uip_appdata, *readLength);
NetworkAddress * networkAddress = NULL;
NetworkAddress matchAddress;
size_t size = sizeof(struct _NetworkAddress);
memset(&matchAddress, 0, size);
memcpy(&matchAddress.Address, &UIP_IP_BUF->srcipaddr, sizeof(uip_ipaddr_t));
matchAddress.Port = UIP_IP_BUF->srcport; //uip_ntohs(UIP_UDP_BUF->srcport);
matchAddress.Secure = (networkSocket->SocketType & NetworkSocketType_Secure) == NetworkSocketType_Secure;
networkAddress = getCachedAddress(&matchAddress, NULL, 0);
NetworkAddress * networkAddress = getCachedAddress(address, port);

if (networkAddress == NULL)
{
networkAddress = addCachedAddress(NULL, 0);
networkAddress = addCachedAddress(address, port, secure);
if (networkAddress)
{
// Add new address to cache (note: uri and secure is unknown)
memcpy(networkAddress, &matchAddress, size);
networkAddress->useCount++; // TODO - ensure addresses are freed? (after t/o or transaction or DTLS session closed)
}
}
Expand Down