Commit a87b81e4 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

* #9910: fix 606 error code nomenclature

A 606 error doesn't necessarily have anything to do with STUN
parent e22663eb
...@@ -59,7 +59,7 @@ enum RegistrationState { ...@@ -59,7 +59,7 @@ enum RegistrationState {
ErrorNetwork , ErrorNetwork ,
ErrorHost, ErrorHost,
ErrorExistStun, ErrorExistStun,
ErrorConfStun, ErrorNotAcceptable,
NumberOfStates NumberOfStates
}; };
......
...@@ -1572,7 +1572,7 @@ void registration_cb(pjsip_regc_cbparam *param) ...@@ -1572,7 +1572,7 @@ void registration_cb(pjsip_regc_cbparam *param)
if (param->code < 0 || param->code >= 300) { if (param->code < 0 || param->code >= 300) {
switch (param->code) { switch (param->code) {
case 606: case 606:
account->setRegistrationState(ErrorConfStun); account->setRegistrationState(ErrorNotAcceptable);
break; break;
case 503: case 503:
......
...@@ -162,8 +162,8 @@ const gchar * account_state_name(account_state_t s) ...@@ -162,8 +162,8 @@ const gchar * account_state_name(account_state_t s)
return _("Network unreachable"); return _("Network unreachable");
case ACCOUNT_STATE_ERROR_HOST: case ACCOUNT_STATE_ERROR_HOST:
return _("Host unreachable"); return _("Host unreachable");
case ACCOUNT_STATE_ERROR_CONF_STUN: case ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE:
return _("Stun configuration error"); return _("Not acceptable");
case ACCOUNT_STATE_ERROR_EXIST_STUN: case ACCOUNT_STATE_ERROR_EXIST_STUN:
return _("Stun server invalid"); return _("Stun server invalid");
case ACCOUNT_STATE_IP2IP_READY: case ACCOUNT_STATE_IP2IP_READY:
......
...@@ -58,7 +58,7 @@ typedef enum { ...@@ -58,7 +58,7 @@ typedef enum {
/** Stun server is not existing. The account is not registered */ /** Stun server is not existing. The account is not registered */
ACCOUNT_STATE_ERROR_EXIST_STUN, ACCOUNT_STATE_ERROR_EXIST_STUN,
/** Stun server configuration error. The account is not registered */ /** Stun server configuration error. The account is not registered */
ACCOUNT_STATE_ERROR_CONF_STUN, ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE,
/** IP2IP Account is always ready */ /** IP2IP Account is always ready */
ACCOUNT_STATE_IP2IP_READY, ACCOUNT_STATE_IP2IP_READY,
/** Invalid state */ /** Invalid state */
......
...@@ -227,17 +227,17 @@ void sflphone_fill_account_list(void) ...@@ -227,17 +227,17 @@ void sflphone_fill_account_list(void)
acc->state = ACCOUNT_STATE_TRYING; acc->state = ACCOUNT_STATE_TRYING;
else if (g_strcmp0(status, "ERROR") == 0) else if (g_strcmp0(status, "ERROR") == 0)
acc->state = ACCOUNT_STATE_ERROR; acc->state = ACCOUNT_STATE_ERROR;
else if (g_strcmp0(status , "ERROR_AUTH") == 0) else if (g_strcmp0(status, "ERROR_AUTH") == 0)
acc->state = ACCOUNT_STATE_ERROR_AUTH; acc->state = ACCOUNT_STATE_ERROR_AUTH;
else if (g_strcmp0(status , "ERROR_NETWORK") == 0) else if (g_strcmp0(status, "ERROR_NETWORK") == 0)
acc->state = ACCOUNT_STATE_ERROR_NETWORK; acc->state = ACCOUNT_STATE_ERROR_NETWORK;
else if (g_strcmp0(status , "ERROR_HOST") == 0) else if (g_strcmp0(status, "ERROR_HOST") == 0)
acc->state = ACCOUNT_STATE_ERROR_HOST; acc->state = ACCOUNT_STATE_ERROR_HOST;
else if (g_strcmp0(status , "ERROR_CONF_STUN") == 0) else if (g_strcmp0(status, "ERROR_NOT_ACCEPTABLE") == 0)
acc->state = ACCOUNT_STATE_ERROR_CONF_STUN; acc->state = ACCOUNT_STATE_ERROR_NOT_ACCEPTABLE;
else if (g_strcmp0(status , "ERROR_EXIST_STUN") == 0) else if (g_strcmp0(status, "ERROR_EXIST_STUN") == 0)
acc->state = ACCOUNT_STATE_ERROR_EXIST_STUN; acc->state = ACCOUNT_STATE_ERROR_EXIST_STUN;
else if (g_strcmp0(status , "ACCOUNT_STATE_IP2IP_READY") == 0) else if (g_strcmp0(status, "ACCOUNT_STATE_IP2IP_READY") == 0)
acc->state = ACCOUNT_STATE_IP2IP_READY; acc->state = ACCOUNT_STATE_IP2IP_READY;
else else
acc->state = ACCOUNT_STATE_INVALID; acc->state = ACCOUNT_STATE_INVALID;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment