Rename reload-push-options [sync] to [update-clients]

Author: maurice2k

src/openvpn/manage.c

@@ -137,8 +137,8 @@ man_help(void)
     msg(M_CLIENT, "push-update-broad options : Broadcast a message to update the specified options.");
     msg(M_CLIENT, "                            Ex. push-update-broad \"route something, -dns\"");
     msg(M_CLIENT, "push-update-cid CID options : Send an update message to the client identified by CID.");
-    msg(M_CLIENT, "reload-push-options [sync] : Reload push options from config file for new clients.");
-    msg(M_CLIENT, "                            With 'sync': also sync options to connected clients (add new, remove old).");
+    msg(M_CLIENT, "reload-push-options [update-clients] : Reload push options from config file for new clients.");
+    msg(M_CLIENT, "                            With 'update-clients': also update connected clients (add new, remove old).");
     msg(M_CLIENT, "END");
 }
 
@@ -1729,13 +1729,13 @@ man_dispatch_command(struct management *man, struct status_output *so, const cha
     {
         if (man->persist.callback.reload_push_options)
         {
-            bool sync = (p[1] && streq(p[1], "sync"));
-            bool status = (*man->persist.callback.reload_push_options)(man->persist.callback.arg, sync);
+            bool update_clients = (p[1] && streq(p[1], "update-clients"));
+            bool status = (*man->persist.callback.reload_push_options)(man->persist.callback.arg, update_clients);
             if (status)
             {
-                if (sync)
+                if (update_clients)
                 {
-                    msg(M_CLIENT, "SUCCESS: push options reloaded and synced to all clients");
+                    msg(M_CLIENT, "SUCCESS: push options reloaded and sent to all clients");
                 }
                 else
                 {

src/openvpn/manage.h

@@ -198,7 +198,7 @@ struct management_callback
     bool (*remote_entry_get)(void *arg, unsigned int index, char **remote);
     bool (*push_update_broadcast)(void *arg, const char *options);
     bool (*push_update_by_cid)(void *arg, unsigned long cid, const char *options);
-    bool (*reload_push_options)(void *arg, bool sync);
+    bool (*reload_push_options)(void *arg, bool update_clients);
 };
 
 /*

src/openvpn/multi.c

@@ -4173,11 +4173,11 @@ find_updatable_option_index(const char *option)
  * function runs sequentially with all other operations.
  *
  * @param arg   Pointer to multi_context
- * @param sync  If true, sync options to connected clients (add new, remove old)
+ * @param update_clients  If true, update connected clients (add new, remove old)
  * @return true on success, false on failure
  */
 static bool
-management_callback_reload_push_options(void *arg, bool sync)
+management_callback_reload_push_options(void *arg, bool update_clients)
 {
     struct multi_context *m = (struct multi_context *)arg;
     struct gc_arena gc = gc_new();
@@ -4192,7 +4192,7 @@ management_callback_reload_push_options(void *arg, bool sync)
         goto cleanup;
     }
 
-    /* Save reference to old push_list for sync comparison */
+    /* Save reference to old push_list for update comparison */
     struct push_list old_push_list = m->top.options.push_list;
 
     /* Create a temporary options structure to parse the config */
@@ -4241,9 +4241,9 @@ management_callback_reload_push_options(void *arg, bool sync)
     /* Free the temporary options gc_arena (parsed config) */
     gc_free(&new_options.gc);
 
-    /* Sync options to connected clients if requested */
+    /* Update connected clients if requested */
     /* We do this BEFORE swapping the lists so we can compare old vs new */
-    if (sync)
+    if (update_clients)
     {
         /* Calculate required buffer size: sum of all option lengths + separators */
         size_t opts_size = 0;
@@ -4284,11 +4284,11 @@ management_callback_reload_push_options(void *arg, bool sync)
                     {
                         type_removed[type_idx] = true;
                         removed++;
-                        msg(D_PUSH, "MANAGEMENT: Sync removing: %s", old_e->option);
+                        msg(D_PUSH, "MANAGEMENT: Removing: %s", old_e->option);
                     }
                     else
                     {
-                        msg(M_WARN, "MANAGEMENT: Cannot sync removal of option '%s' (not updatable)", old_e->option);
+                        msg(M_WARN, "MANAGEMENT: Cannot remove option '%s' (not updatable)", old_e->option);
                     }
                 }
             }
@@ -4332,13 +4332,13 @@ management_callback_reload_push_options(void *arg, bool sync)
                 {
                     should_send = true;
                     added++;
-                    msg(D_PUSH, "MANAGEMENT: Sync adding: %s", new_e->option);
+                    msg(D_PUSH, "MANAGEMENT: Adding: %s", new_e->option);
                 }
                 /* Also resend options if their type was reset (because we sent -type) */
                 else if (type_was_reset)
                 {
                     should_send = true;
-                    msg(D_PUSH, "MANAGEMENT: Sync re-adding (type reset): %s", new_e->option);
+                    msg(D_PUSH, "MANAGEMENT: Re-adding (type reset): %s", new_e->option);
                 }
 
                 if (should_send)
@@ -4356,13 +4356,13 @@ management_callback_reload_push_options(void *arg, bool sync)
 
         if (BLEN(&opts) > 0)
         {
-            msg(M_INFO, "MANAGEMENT: Syncing push options to clients (added=%d, removed=%d)",
+            msg(M_INFO, "MANAGEMENT: Updating clients with push options (added=%d, removed=%d)",
                 added, removed);
             management_callback_send_push_update_broadcast(m, BSTR(&opts));
         }
         else
         {
-            msg(M_INFO, "MANAGEMENT: No changes to sync to clients");
+            msg(M_INFO, "MANAGEMENT: No changes to send to clients");
         }
     }