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
99ad29ad
Commit
99ad29ad
authored
15 years ago
by
Alexandre Savard
Browse files
Options
Downloads
Patches
Plain Diff
[#3742] Fix IAX accounts no longer register in the daily builds
parent
fdabcfc9
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
sflphone-common/src/iax/iaxaccount.cpp
+3
-3
3 additions, 3 deletions
sflphone-common/src/iax/iaxaccount.cpp
sflphone-common/src/iax/iaxvoiplink.cpp
+7
-3
7 additions, 3 deletions
sflphone-common/src/iax/iaxvoiplink.cpp
with
10 additions
and
6 deletions
sflphone-common/src/iax/iaxaccount.cpp
+
3
−
3
View file @
99ad29ad
...
@@ -202,9 +202,9 @@ int IAXAccount::registerVoIPLink()
...
@@ -202,9 +202,9 @@ int IAXAccount::registerVoIPLink()
_link
->
init
();
_link
->
init
();
// Stuff needed for IAX registration
// Stuff needed for IAX registration
setHostname
(
Manager
::
instance
().
getConfigString
(
_accountID
,
HOSTNAME
)
);
setHostname
(
_hostname
);
setUsername
(
Manager
::
instance
().
getConfigString
(
_accountID
,
USERNAME
)
);
setUsername
(
_username
);
setPassword
(
Manager
::
instance
().
getConfigString
(
_accountID
,
PASSWORD
)
);
setPassword
(
_password
);
_link
->
sendRegister
(
_accountID
);
_link
->
sendRegister
(
_accountID
);
...
...
This diff is collapsed.
Click to expand it.
sflphone-common/src/iax/iaxvoiplink.cpp
+
7
−
3
View file @
99ad29ad
...
@@ -413,14 +413,18 @@ IAXVoIPLink::sendRegister (AccountID id)
...
@@ -413,14 +413,18 @@ IAXVoIPLink::sendRegister (AccountID id)
IAXAccount
*
account
;
IAXAccount
*
account
;
bool
result
;
bool
result
;
_debug
(
"IAX: Sending registration"
);
result
=
false
;
result
=
false
;
account
=
dynamic_cast
<
IAXAccount
*>
(
getAccountPtr
());
account
=
dynamic_cast
<
IAXAccount
*>
(
getAccountPtr
());
if
(
account
->
getHostname
().
empty
())
{
if
(
account
->
getHostname
().
empty
())
{
_error
(
"IAX: Error: Account hostname is empty"
);
return
false
;
return
false
;
}
}
if
(
account
->
getUsername
().
empty
())
{
if
(
account
->
getUsername
().
empty
())
{
_error
(
"IAX: Error: Account username is empty"
);
return
false
;
return
false
;
}
}
...
@@ -435,11 +439,11 @@ IAXVoIPLink::sendRegister (AccountID id)
...
@@ -435,11 +439,11 @@ IAXVoIPLink::sendRegister (AccountID id)
_regSession
=
iax_session_new
();
_regSession
=
iax_session_new
();
if
(
!
_regSession
)
{
if
(
!
_regSession
)
{
_debug
(
"Error when generating new session for register"
);
_debug
(
"
IAX:
Error when generating new session for register"
);
}
else
{
}
else
{
_debug
(
"IAX Sending registration to %s with user %s"
,
account
->
getHostname
().
c_str
()
,
account
->
getUsername
().
c_str
());
_debug
(
"IAX
:
Sending registration to %s with user %s"
,
account
->
getHostname
().
c_str
()
,
account
->
getUsername
().
c_str
());
int
val
=
iax_register
(
_regSession
,
account
->
getHostname
().
data
(),
account
->
getUsername
().
data
(),
account
->
getPassword
().
data
(),
120
);
int
val
=
iax_register
(
_regSession
,
account
->
getHostname
().
data
(),
account
->
getUsername
().
data
(),
account
->
getPassword
().
data
(),
120
);
_debug
(
"Return value: %d"
,
val
);
_debug
(
"
IAX:
Return value: %d"
,
val
);
// set the time-out to 15 seconds, after that, resend a registration request.
// set the time-out to 15 seconds, after that, resend a registration request.
// until we unregister.
// until we unregister.
_nextRefreshStamp
=
time
(
NULL
)
+
10
;
_nextRefreshStamp
=
time
(
NULL
)
+
10
;
...
...
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