Clean up route preference names. (#1810)

This commit is contained in:
Jonathan Hui
2017-05-24 08:34:49 -07:00
committed by GitHub
parent a6a5b62d34
commit fce2d83927
3 changed files with 18 additions and 18 deletions
@@ -1596,15 +1596,15 @@ OTNODEAPI int32_t OTCALL otNodeAddPrefix(otNode* aNode, const char *aPrefix, con
if (strcmp(aPreference, "high") == 0)
{
config.mPreference = kRoutePreferenceHigh;
config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
}
else if (strcmp(aPreference, "med") == 0)
{
config.mPreference = kRoutePreferenceMedium;
config.mPreference = OT_ROUTE_PREFERENCE_MED;
}
else if (strcmp(aPreference, "low") == 0)
{
config.mPreference = kRoutePreferenceLow;
config.mPreference = OT_ROUTE_PREFERENCE_LOW;
}
else
{
@@ -1639,15 +1639,15 @@ OTNODEAPI int32_t OTCALL otNodeAddRoute(otNode* aNode, const char *aPrefix, cons
if (strcmp(aPreference, "high") == 0)
{
config.mPreference = kRoutePreferenceHigh;
config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
}
else if (strcmp(aPreference, "med") == 0)
{
config.mPreference = kRoutePreferenceMedium;
config.mPreference = OT_ROUTE_PREFERENCE_MED;
}
else if (strcmp(aPreference, "low") == 0)
{
config.mPreference = kRoutePreferenceLow;
config.mPreference = OT_ROUTE_PREFERENCE_LOW;
}
else
{
+3 -3
View File
@@ -762,9 +762,9 @@ typedef struct otExternalRouteConfig
*/
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.
OT_ROUTE_PREFERENCE_LOW = -1, ///< Low route preference.
OT_ROUTE_PREFERENCE_MED = 0, ///< Medium route preference.
OT_ROUTE_PREFERENCE_HIGH = 1, ///< High route preference.
} otRoutePreference;
/**
+9 -9
View File
@@ -1820,15 +1820,15 @@ otError Interpreter::ProcessPrefixAdd(int argc, char *argv[])
{
if (strcmp(argv[argcur], "high") == 0)
{
config.mPreference = kRoutePreferenceHigh;
config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
}
else if (strcmp(argv[argcur], "med") == 0)
{
config.mPreference = kRoutePreferenceMedium;
config.mPreference = OT_ROUTE_PREFERENCE_MED;
}
else if (strcmp(argv[argcur], "low") == 0)
{
config.mPreference = kRoutePreferenceLow;
config.mPreference = OT_ROUTE_PREFERENCE_LOW;
}
else
{
@@ -1962,15 +1962,15 @@ otError Interpreter::ProcessPrefixList(void)
switch (config.mPreference)
{
case kRoutePreferenceLow:
case OT_ROUTE_PREFERENCE_LOW:
sServer->OutputFormat(" low\r\n");
break;
case kRoutePreferenceMedium:
case OT_ROUTE_PREFERENCE_MED:
sServer->OutputFormat(" med\r\n");
break;
case kRoutePreferenceHigh:
case OT_ROUTE_PREFERENCE_HIGH:
sServer->OutputFormat(" high\r\n");
break;
}
@@ -2074,15 +2074,15 @@ otError Interpreter::ProcessRouteAdd(int argc, char *argv[])
}
else if (strcmp(argv[argcur], "high") == 0)
{
config.mPreference = kRoutePreferenceHigh;
config.mPreference = OT_ROUTE_PREFERENCE_HIGH;
}
else if (strcmp(argv[argcur], "med") == 0)
{
config.mPreference = kRoutePreferenceMedium;
config.mPreference = OT_ROUTE_PREFERENCE_MED;
}
else if (strcmp(argv[argcur], "low") == 0)
{
config.mPreference = kRoutePreferenceLow;
config.mPreference = OT_ROUTE_PREFERENCE_LOW;
}
else
{