Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
2a49b64a
Commit
2a49b64a
authored
Jan 30, 2023
by
Adrien Béraud
Browse files
Options
Downloads
Patches
Plain Diff
registration state: add initial unloaded state
Change-Id: Ic96399c9d58b4abbd0bc9b3cbab9f27c8b479b04
parent
85de1297
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
src/account.cpp
+1
-1
1 addition, 1 deletion
src/account.cpp
src/account.h
+1
-1
1 addition, 1 deletion
src/account.h
src/registration_states.h
+1
-0
1 addition, 0 deletions
src/registration_states.h
src/sip/sipaccount.cpp
+2
-0
2 additions, 0 deletions
src/sip/sipaccount.cpp
with
5 additions
and
2 deletions
src/account.cpp
+
1
−
1
View file @
2a49b64a
...
@@ -72,7 +72,6 @@ const std::string Account::DEFAULT_USER_AGENT = Account::getDefaultUserAgent();
...
@@ -72,7 +72,6 @@ const std::string Account::DEFAULT_USER_AGENT = Account::getDefaultUserAgent();
Account
::
Account
(
const
std
::
string
&
accountID
)
Account
::
Account
(
const
std
::
string
&
accountID
)
:
rand
(
dht
::
crypto
::
getSeededRandomEngine
<
std
::
mt19937_64
>
())
:
rand
(
dht
::
crypto
::
getSeededRandomEngine
<
std
::
mt19937_64
>
())
,
accountID_
(
accountID
)
,
accountID_
(
accountID
)
,
registrationState_
(
RegistrationState
::
UNREGISTERED
)
,
systemCodecContainer_
(
getSystemCodecContainer
())
,
systemCodecContainer_
(
getSystemCodecContainer
())
{
{
// Initialize the codec order, used when creating a new account
// Initialize the codec order, used when creating a new account
...
@@ -228,6 +227,7 @@ Account::mapStateNumberToString(RegistrationState state)
...
@@ -228,6 +227,7 @@ Account::mapStateNumberToString(RegistrationState state)
return #X
return #X
switch
(
state
)
{
switch
(
state
)
{
CASE_STATE
(
UNLOADED
);
CASE_STATE
(
UNREGISTERED
);
CASE_STATE
(
UNREGISTERED
);
CASE_STATE
(
TRYING
);
CASE_STATE
(
TRYING
);
CASE_STATE
(
REGISTERED
);
CASE_STATE
(
REGISTERED
);
...
...
This diff is collapsed.
Click to expand it.
src/account.h
+
1
−
1
View file @
2a49b64a
...
@@ -455,7 +455,7 @@ protected:
...
@@ -455,7 +455,7 @@ protected:
* The general, protocol neutral registration
* The general, protocol neutral registration
* state of the account
* state of the account
*/
*/
RegistrationState
registrationState_
;
RegistrationState
registrationState_
{
RegistrationState
::
UNLOADED
}
;
/**
/**
* Vector containing all system codecs (with default parameters)
* Vector containing all system codecs (with default parameters)
...
...
This diff is collapsed.
Click to expand it.
src/registration_states.h
+
1
−
0
View file @
2a49b64a
...
@@ -29,6 +29,7 @@ namespace jami {
...
@@ -29,6 +29,7 @@ namespace jami {
/** Contains all the Registration states for an account can be in */
/** Contains all the Registration states for an account can be in */
enum
class
RegistrationState
{
enum
class
RegistrationState
{
UNLOADED
,
UNREGISTERED
,
UNREGISTERED
,
TRYING
,
TRYING
,
REGISTERED
,
REGISTERED
,
...
...
This diff is collapsed.
Click to expand it.
src/sip/sipaccount.cpp
+
2
−
0
View file @
2a49b64a
...
@@ -1055,6 +1055,8 @@ SIPAccount::loadConfig()
...
@@ -1055,6 +1055,8 @@ SIPAccount::loadConfig()
transportType_
=
PJSIP_TRANSPORT_TLS
;
transportType_
=
PJSIP_TRANSPORT_TLS
;
}
else
}
else
transportType_
=
PJSIP_TRANSPORT_UDP
;
transportType_
=
PJSIP_TRANSPORT_UDP
;
if
(
registrationState_
==
RegistrationState
::
UNLOADED
)
setRegistrationState
(
RegistrationState
::
UNREGISTERED
);
}
}
bool
bool
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment