Create and use an enum for Route Config mPreference. (#1525)

This commit is contained in:
pvanhorn
2017-03-29 08:49:48 -07:00
committed by Jonathan Hui
parent 69b502f4b5
commit 02400eecb2
3 changed files with 25 additions and 15 deletions
@@ -1562,15 +1562,15 @@ OTNODEAPI int32_t OTCALL otNodeAddPrefix(otNode* aNode, const char *aPrefix, con
if (strcmp(aPreference, "high") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceHigh;
}
else if (strcmp(aPreference, "med") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceMedium;
}
else if (strcmp(aPreference, "low") == 0)
{
config.mPreference = -1;
config.mPreference = kRoutePreferenceLow;
}
else
{
@@ -1605,15 +1605,15 @@ OTNODEAPI int32_t OTCALL otNodeAddRoute(otNode* aNode, const char *aPrefix, cons
if (strcmp(aPreference, "high") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceHigh;
}
else if (strcmp(aPreference, "med") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceMedium;
}
else if (strcmp(aPreference, "low") == 0)
{
config.mPreference = -1;
config.mPreference = kRoutePreferenceLow;
}
else
{
+10
View File
@@ -697,6 +697,16 @@ typedef struct otExternalRouteConfig
bool mStable : 1;
} otExternalRouteConfig;
/**
* Defines valid values for member mPreference in otExternalRouteConfig and otBorderRouterConfig.
*/
typedef enum otRoutePreference
{
kRoutePreferenceLow = -1, ///< Routes assigned this value are used as a last resort when no other more preferred route exists.
kRoutePreferenceMedium = 0, ///< Routes assigned this value should be selected only in the absence of any kRoutePreferenceHigh routes.
kRoutePreferenceHigh = 1 ///< The most preferred route. Routes assigned this value should be selected over any other route.
} otRoutePreference;
/**
* @}
*
+9 -9
View File
@@ -1723,15 +1723,15 @@ ThreadError Interpreter::ProcessPrefixAdd(int argc, char *argv[])
{
if (strcmp(argv[argcur], "high") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceHigh;
}
else if (strcmp(argv[argcur], "med") == 0)
{
config.mPreference = 0;
config.mPreference = kRoutePreferenceMedium;
}
else if (strcmp(argv[argcur], "low") == 0)
{
config.mPreference = -1;
config.mPreference = kRoutePreferenceLow;
}
else
{
@@ -1865,15 +1865,15 @@ ThreadError Interpreter::ProcessPrefixList(void)
switch (config.mPreference)
{
case -1:
case kRoutePreferenceLow:
sServer->OutputFormat(" low\r\n");
break;
case 0:
case kRoutePreferenceMedium:
sServer->OutputFormat(" med\r\n");
break;
case 1:
case kRoutePreferenceHigh:
sServer->OutputFormat(" high\r\n");
break;
}
@@ -1975,15 +1975,15 @@ ThreadError Interpreter::ProcessRouteAdd(int argc, char *argv[])
}
else if (strcmp(argv[argcur], "high") == 0)
{
config.mPreference = 1;
config.mPreference = kRoutePreferenceHigh;
}
else if (strcmp(argv[argcur], "med") == 0)
{
config.mPreference = 0;
config.mPreference = kRoutePreferenceMedium;
}
else if (strcmp(argv[argcur], "low") == 0)
{
config.mPreference = -1;
config.mPreference = kRoutePreferenceLow;
}
else
{