Defer automatic retries until Android standby wakes

src/routing_layer/topo_group_connect.c

@@ -179,7 +179,7 @@ static void tgc_resume(void* arg) {
 
 static int tgc_pause(struct TOPO_GROUP_CONNECT* gc) {
 #ifdef UTUN_HAVE_STANDBY
-    if (standby_is_enabled()) {
+    if (standby_get_sleep_tb() > 0) {
         gc->pause_wait = standby_wait(gc, tgc_resume);
         if (gc->pause_wait) { gc->paused = 1; return 1; }
         DEBUG_WARN(DEBUG_CATEGORY_BGP, "cannot wait for standby; using group retry timer");
@@ -265,6 +265,9 @@ static void tgc_step(void* arg) {
                 topo_group_peer_close(request); pending[c->kind]--; c->retry_at = now; changed = 1;
             }
         }
+#ifdef UTUN_HAVE_STANDBY
+        if (!gc->paused && standby_get_sleep_tb() > 0) tgc_pause(gc);
+#endif
         for (int kind = TGC_SUPER; !gc->paused && kind < TGC_CLASSES; kind++) {
             if (!allowed[kind]) continue;
             int limit = gc->self_super && kind == TGC_SUPER ? TGC_PARALLEL : TGC_TARGET - up[kind];