Merge "res_pjsip_outbound_registration.c: Be tolerant of short registration timeouts."
authorMatt Jordan <mjordan@digium.com>
Sat, 21 Nov 2015 16:57:16 +0000 (10:57 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Sat, 21 Nov 2015 16:57:16 +0000 (10:57 -0600)
res/res_pjsip_outbound_registration.c

index 3921aa0..e6cd961 100644 (file)
@@ -796,11 +796,18 @@ static int handle_registration_response(void *data)
        if (PJSIP_IS_STATUS_IN_CLASS(response->code, 200)) {
                /* Check if this is in regards to registering or unregistering */
                if (response->expiration) {
+                       int next_registration_round;
+
                        /* If the registration went fine simply reschedule registration for the future */
                        ast_debug(1, "Outbound registration to '%s' with client '%s' successful\n", server_uri, client_uri);
                        response->client_state->status = SIP_REGISTRATION_REGISTERED;
                        response->client_state->retries = 0;
-                       schedule_registration(response->client_state, response->expiration - REREGISTER_BUFFER_TIME);
+                       next_registration_round = response->expiration - REREGISTER_BUFFER_TIME;
+                       if (next_registration_round < 0) {
+                               /* Re-register immediately. */
+                               next_registration_round = 0;
+                       }
+                       schedule_registration(response->client_state, next_registration_round);
                } else {
                        ast_debug(1, "Outbound unregistration to '%s' with client '%s' successful\n", server_uri, client_uri);
                        response->client_state->status = SIP_REGISTRATION_UNREGISTERED;