Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
358516fd
Commit
358516fd
authored
Sep 09, 2013
by
Simon Morlat
Browse files
prevent publish to be sent while client is registering on the same proxy.
parent
746b521c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
3 deletions
+11
-3
coreapi/bellesip_sal/sal_impl.c
coreapi/bellesip_sal/sal_impl.c
+4
-2
coreapi/bellesip_sal/sal_op_call.c
coreapi/bellesip_sal/sal_op_call.c
+1
-1
coreapi/callbacks.c
coreapi/callbacks.c
+6
-0
No files found.
coreapi/bellesip_sal/sal_impl.c
View file @
358516fd
...
...
@@ -114,7 +114,9 @@ void sal_process_authentication(SalOp *op) {
sal_add_pending_auth
(
op
->
base
.
root
,
op
);
if
(
op
->
dialog
&&
belle_sip_dialog_get_state
(
op
->
dialog
)
==
BELLE_SIP_DIALOG_CONFIRMED
)
{
request
=
belle_sip_dialog_create_queued_request_from
(
op
->
dialog
,(
const
belle_sip_request_t
*
)
request
);
request
=
belle_sip_dialog_create_request_from
(
op
->
dialog
,
request
);
if
(
!
request
)
request
=
belle_sip_dialog_create_queued_request_from
(
op
->
dialog
,
request
);
is_within_dialog
=
TRUE
;
}
else
{
belle_sip_message_remove_header
(
BELLE_SIP_MESSAGE
(
request
),
BELLE_SIP_AUTHORIZATION
);
...
...
@@ -346,7 +348,7 @@ static void process_transaction_terminated(void *user_ctx, const belle_sip_trans
if
(
op
&&
op
->
callbacks
.
process_transaction_terminated
)
{
op
->
callbacks
.
process_transaction_terminated
(
op
,
event
);
}
else
{
ms_
error
(
"Unhandled transaction terminated [%p]"
,
trans
);
ms_
message
(
"Unhandled transaction terminated [%p]"
,
trans
);
}
if
(
op
&&
client_transaction
)
sal_op_unref
(
op
);
/*because every client transaction ref op*/
...
...
coreapi/bellesip_sal/sal_op_call.c
View file @
358516fd
...
...
@@ -764,7 +764,7 @@ int sal_call_terminate(SalOp *op){
break
;
}
default:
{
ms_
fatal
(
"sal_call_terminate not implemented yet for dialog state [%s]"
,
belle_sip_dialog_state_to_string
(
dialog_state
));
ms_
error
(
"sal_call_terminate not implemented yet for dialog state [%s]"
,
belle_sip_dialog_state_to_string
(
dialog_state
));
return
-
1
;
}
}
...
...
coreapi/callbacks.c
View file @
358516fd
...
...
@@ -807,6 +807,12 @@ static void register_failure(SalOp *op, SalError error, SalReason reason, const
}
else
{
linphone_proxy_config_set_state
(
cfg
,
LinphoneRegistrationFailed
,
details
);
}
if
(
cfg
->
publish_op
){
/*prevent publish to be sent now until registration gets successful*/
sal_op_release
(
cfg
->
publish_op
);
cfg
->
publish_op
=
NULL
;
cfg
->
send_publish
=
cfg
->
publish
;
}
if
(
error
==
SalErrorFailure
&&
reason
==
SalReasonForbidden
)
{
const
char
*
realm
=
NULL
,
*
username
=
NULL
;
if
(
sal_op_get_auth_requested
(
op
,
&
realm
,
&
username
)
==
0
){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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