Skip to content

GitLab

Commit 58d53d4b authored by Simon Morlat's avatar Simon Morlat
Browse files

add new parameter to refresher's listener to indicate if the refresher is... 

add new parameter to refresher's listener to indicate if the refresher is going to retry the request.
parent ce805eca
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 11 deletions
include/belle-sip/headers.h
View file @ 58d53d4b
......@@ -244,7 +244,7 @@ BELLESIP_EXPORT belle_sip_header_contact_t* belle_sip_header_contact_create (con
******************************/
typedef struct _belle_sip_header_diversion belle_sip_header_diversion_t;
BELLESIP_EXPORT belle_sip_header_diversion_t* belle_sip_header_diversion_new();
BELLESIP_EXPORT belle_sip_header_diversion_t* belle_sip_header_diversion_new(void);
BELLESIP_EXPORT belle_sip_header_diversion_t* belle_sip_header_diversion_parse(const char* diversion) ;
......
include/belle-sip/refresher.h
View file @ 58d53d4b
......@@ -30,11 +30,12 @@ typedef struct belle_sip_refresher belle_sip_refresher_t;
* @param user_pointer user pointer
* @param status_code status code for the last refresh action
* @param reason_phrase
* @param will_retry a boolean indicating wether the refresher is going to retry the request automatically.
* */
typedef void (*belle_sip_refresher_listener_t) (belle_sip_refresher_t* refresher
,void* user_pointer
,unsigned int status_code
,const char* reason_phrase);
,void* user_pointer
,unsigned int status_code
,const char* reason_phrase, int will_retry);
/**
* add a refresher listener
......
src/refresher.c
View file @ 58d53d4b
......@@ -107,7 +107,7 @@ static void process_dialog_terminated(belle_sip_listener_t *user_ctx, const bell
if (refresher->state == started) {
belle_sip_warning("Refresher [%p] still started but receiving unexpected dialog deleted event on [%p], retrying",refresher,dialog);
retry_later_on_io_error(refresher);
if (refresher->listener) refresher->listener(refresher,refresher->user_data,481, "dialod terminated");
if (refresher->listener) refresher->listener(refresher,refresher->user_data,481, "dialod terminated", TRUE);
}
}
......@@ -131,7 +131,7 @@ static void process_io_error(belle_sip_listener_t *user_ctx, const belle_sip_io_
return; /*not for me or no longuer involved because expire=0*/
}
if (refresher->state==started) retry_later_on_io_error(refresher);
if (refresher->listener) refresher->listener(refresher,refresher->user_data,503, "io error");
if (refresher->listener) refresher->listener(refresher,refresher->user_data,503, "io error", refresher->state == started);
return;
} else if (BELLE_SIP_OBJECT_IS_INSTANCE_OF(belle_sip_io_error_event_get_source(event),belle_sip_provider_t)) {
......@@ -146,7 +146,7 @@ static void process_io_error(belle_sip_listener_t *user_ctx, const belle_sip_io_
,refresher->transaction->base.channel
,belle_sip_channel_state_to_string(belle_sip_channel_get_state(refresher->transaction->base.channel)));
if (refresher->state==started) retry_later_on_io_error(refresher);
if (refresher->listener) refresher->listener(refresher,refresher->user_data,503, "io error");
if (refresher->listener) refresher->listener(refresher,refresher->user_data,503, "io error", refresher->state == started);
refresher->on_io_error=1;
}
return;
......@@ -206,6 +206,7 @@ static void process_response_event(belle_sip_listener_t *user_ctx, const belle_s
int response_code = belle_sip_response_get_status_code(response);
belle_sip_refresher_t* refresher=(belle_sip_refresher_t*)user_ctx;
belle_sip_header_contact_t *contact;
int will_retry = TRUE; /*most error codes are retryable*/
if (refresher && (client_transaction !=refresher->transaction))
......@@ -291,6 +292,7 @@ static void process_response_event(belle_sip_listener_t *user_ctx, const belle_s
case 403:
/*In case of 403, we will retry later, just in case*/
if (refresher->target_expires>0) retry_later(refresher);
else will_retry = FALSE;
break;
case 412:
if (strcmp(belle_sip_request_get_method(request),"PUBLISH")==0) {
......@@ -298,9 +300,12 @@ static void process_response_event(belle_sip_listener_t *user_ctx, const belle_s
if (refresher->target_expires>0) {
retry_later_on_io_error(refresher);
return; /*do not notify this kind of error*/
}else{
will_retry = FALSE;
}
} else {
if (refresher->target_expires>0) retry_later(refresher);
else will_retry = FALSE;
}
break;
case 423:{
......@@ -316,6 +321,7 @@ static void process_response_event(belle_sip_listener_t *user_ctx, const belle_s
}
}
}else belle_sip_warning("Receiving 423 but no min-expires header.");
will_retry = FALSE;
break;
}
case 481: {
......@@ -328,18 +334,21 @@ static void process_response_event(belle_sip_listener_t *user_ctx, const belle_s
return; /*do not notify this kind of error*/
}
}
/*intentionally no break*/
case 505:
case 501:
/*irrecoverable errors, probably no need to retry later*/
will_retry = FALSE;
break;
default:
/*for all other errors, retry later*/
if (refresher->target_expires>0) retry_later(refresher);
else will_retry = FALSE;
break;
}
}
if (refresher->listener) refresher->listener(refresher,refresher->user_data,response_code, belle_sip_response_get_reason_phrase(response));
if (refresher->listener) refresher->listener(refresher,refresher->user_data,response_code, belle_sip_response_get_reason_phrase(response), will_retry);
}
......@@ -354,7 +363,7 @@ static void process_timeout(belle_sip_listener_t *user_ctx, const belle_sip_time
/*retry in 2 seconds but not immediately to let the current transaction be cleaned*/
schedule_timer_at(refresher,2000,RETRY);
}
if (refresher->listener) refresher->listener(refresher,refresher->user_data,408, "timeout");
if (refresher->listener) refresher->listener(refresher,refresher->user_data,408, "timeout", refresher->state==started);
}
static void process_transaction_terminated(belle_sip_listener_t *user_ctx, const belle_sip_transaction_terminated_event_t *event) {
......@@ -597,7 +606,7 @@ static int timer_cb(void *user_data, unsigned int events) {
if (refresher->timer_purpose==NORMAL_REFRESH && refresher->manual) {
belle_sip_message("Refresher [%p] is in manual mode, skipping refresh.",refresher);
/*call listener with special code 0 to indicate request is about to expire*/
if (refresher->listener) refresher->listener(refresher,refresher->user_data,0, "about to expire");
if (refresher->listener) refresher->listener(refresher,refresher->user_data,0, "about to expire", FALSE);
return BELLE_SIP_STOP;
}
......
tester/belle_sip_refresher_tester.c
View file @ 58d53d4b
......@@ -317,7 +317,7 @@ static void client_process_auth_requested(void *obj, belle_sip_auth_event_t *eve
static void belle_sip_refresher_listener (belle_sip_refresher_t* refresher
,void* user_pointer
,unsigned int status_code
,const char* reason_phrase) {
,const char* reason_phrase, int will_retry) {
endpoint_t* endpoint = (endpoint_t*)user_pointer;
BELLESIP_UNUSED(refresher);
belle_sip_message("belle_sip_refresher_listener [%i] reason [%s]",status_code,reason_phrase);
......
Markdown is supported
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