Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
a87b81e4
Commit
a87b81e4
authored
Apr 21, 2012
by
Tristan Matthews
Browse files
* #9910: fix 606 error code nomenclature
A 606 error doesn't necessarily have anything to do with STUN
parent
e22663eb
Changes
5
Hide whitespace changes
Inline
Side-by-side
daemon/src/account.h
View file @
a87b81e4
...
...
@@ -59,7 +59,7 @@ enum RegistrationState {
ErrorNetwork
,
ErrorHost
,
ErrorExistStun
,
Error
ConfStun
,
Error
NotAcceptable
,
NumberOfStates
};
...
...
daemon/src/sip/sipvoiplink.cpp
View file @
a87b81e4
...
...
@@ -1572,7 +1572,7 @@ void registration_cb(pjsip_regc_cbparam *param)
if
(
param
->
code
<
0
||
param
->
code
>=
300
)
{
switch
(
param
->
code
)
{
case
606
:
account
->
setRegistrationState
(
Error
ConfStun
);
account
->
setRegistrationState
(
Error
NotAcceptable
);
break
;
case
503
:
...
...
gnome/src/accountlist.c
View file @
a87b81e4
...
...
@@ -162,8 +162,8 @@ const gchar * account_state_name(account_state_t s)
return
_
(
"Network unreachable"
);
case
ACCOUNT_STATE_ERROR_HOST
:
return
_
(
"Host unreachable"
);
case
ACCOUNT_STATE_ERROR_
CONF_STUN
:
return
_
(
"
Stun configuration error
"
);
case
ACCOUNT_STATE_ERROR_
NOT_ACCEPTABLE
:
return
_
(
"
Not acceptable
"
);
case
ACCOUNT_STATE_ERROR_EXIST_STUN
:
return
_
(
"Stun server invalid"
);
case
ACCOUNT_STATE_IP2IP_READY
:
...
...
gnome/src/accountlist.h
View file @
a87b81e4
...
...
@@ -58,7 +58,7 @@ typedef enum {
/** Stun server is not existing. The account is not registered */
ACCOUNT_STATE_ERROR_EXIST_STUN
,
/** Stun server configuration error. The account is not registered */
ACCOUNT_STATE_ERROR_
CONF_STUN
,
ACCOUNT_STATE_ERROR_
NOT_ACCEPTABLE
,
/** IP2IP Account is always ready */
ACCOUNT_STATE_IP2IP_READY
,
/** Invalid state */
...
...
gnome/src/actions.c
View file @
a87b81e4
...
...
@@ -227,17 +227,17 @@ void sflphone_fill_account_list(void)
acc
->
state
=
ACCOUNT_STATE_TRYING
;
else
if
(
g_strcmp0
(
status
,
"ERROR"
)
==
0
)
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
;
else
if
(
g_strcmp0
(
status
,
"ERROR_NETWORK"
)
==
0
)
else
if
(
g_strcmp0
(
status
,
"ERROR_NETWORK"
)
==
0
)
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
;
else
if
(
g_strcmp0
(
status
,
"ERROR_
CONF_STUN
"
)
==
0
)
acc
->
state
=
ACCOUNT_STATE_ERROR_
CONF_STUN
;
else
if
(
g_strcmp0
(
status
,
"ERROR_EXIST_STUN"
)
==
0
)
else
if
(
g_strcmp0
(
status
,
"ERROR_
NOT_ACCEPTABLE
"
)
==
0
)
acc
->
state
=
ACCOUNT_STATE_ERROR_
NOT_ACCEPTABLE
;
else
if
(
g_strcmp0
(
status
,
"ERROR_EXIST_STUN"
)
==
0
)
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
;
else
acc
->
state
=
ACCOUNT_STATE_INVALID
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment