Improved keepalive timeout handling in nua/nua_register.c.

darcs-hash:20060503140023-65a35-2a41623e839c651170c6739b98c131eed091f2ee.gz

libsofia-sip-ua/nua/nua_register.c

@@ -1511,12 +1511,6 @@ static int response_to_keepalive_options(nua_owner_t *oc_casted_as_owner,
     oc->oc_kalo = NULL;
   nta_outgoing_destroy(orq);
 
-  if (status == 408 || sip == NULL) {
-    SU_DEBUG_1(("outbound_connect(%p): keepalive timeout\n", oc));
-    /* XXX - do something about it! */
-    return 0;
-  }
-
   binding_check = outbound_connect_nat_detect(oc, sip);
 
   if (binding_check > 1) {
@@ -1531,6 +1525,12 @@ static int response_to_keepalive_options(nua_owner_t *oc_casted_as_owner,
     }
   }
 
+  if (status == 408 || sip == NULL) {
+    SU_DEBUG_1(("outbound_connect(%p): keepalive timeout\n", oc));
+    /* XXX - do something about it! */
+    return 0;
+  }
+
   if (challenged > 0 && credentials > 0) {
     keepalive_options_with_registration_probe(oc);
     return 0;