@@ -7,6 +7,7 @@

 #ifdef ENABLE_MANAGEMENT

 #include "multi.h"

+#include "ssl_util.h"

 #endif

 #if defined(__GNUC__) || defined(__clang__)

@@ -177,20 +178,32 @@ send_single_push_update(struct context *c, struct buffer *msgs, unsigned int *op

         buf_string_compare_advance(&tmp_msg, push_update_cmd);

         if (process_incoming_push_update(c, pull_permission_mask(c), option_types_found, &tmp_msg, true) == PUSH_MSG_ERROR)

         {

-            msg(M_WARN, "Failed to process push update message sent to client ID: %u",

-                c->c2.tls_multi ? c->c2.tls_multi->peer_id : UINT32_MAX);

+            msg(M_WARN, "Failed to process push update message sent to client ID: %u", c->c2.tls_multi->peer_id);

             continue;

         }

         c->options.push_option_types_found |= *option_types_found;

         if (!options_postprocess_pull(&c->options, c->c2.es))

         {

-            msg(M_WARN, "Failed to post-process push update message sent to client ID: %u",

-                c->c2.tls_multi ? c->c2.tls_multi->peer_id : UINT32_MAX);

+            msg(M_WARN, "Failed to post-process push update message sent to client ID: %u", c->c2.tls_multi->peer_id);

         }

     }

     return true;

 }

+/* Return true if the client supports push-update */

+static bool

+support_push_update(struct multi_instance *mi)

+{

+    ASSERT(mi->context.c2.tls_multi);

+    const unsigned int iv_proto_peer = extract_iv_proto(mi->context.c2.tls_multi->peer_info);

+    if (!(iv_proto_peer & IV_PROTO_PUSH_UPDATE))

+    {

+        return false;

+    }

+

+    return true;

+}

+

 int

 send_push_update(struct multi_context *m, const void *target, const char *msg, const push_update_type type, const int push_bundle_size)

 {

@@ -231,9 +244,17 @@ send_push_update(struct multi_context *m, const void *target, const char *msg, c

         if (!mi)

         {

+            gc_free(&gc);

             return -ENOENT;

         }

+        if (!support_push_update(mi))

+        {

+            msg(M_CLIENT, "PUSH_UPDATE: not sending message to unsupported peer with ID: %u", mi->context.c2.tls_multi->peer_id);

+            gc_free(&gc);

+            return 0;

+        }

+

         const char *old_ip = mi->context.options.ifconfig_local;

         const char *old_ipv6 = mi->context.options.ifconfig_ipv6_local;

         if (!mi->halt

@@ -262,7 +283,7 @@ send_push_update(struct multi_context *m, const void *target, const char *msg, c

     {

         struct multi_instance *curr_mi = he->value;

-        if (curr_mi->halt)

+        if (curr_mi->halt || !support_push_update(curr_mi))

         {

             continue;

         }

@@ -273,8 +294,7 @@ send_push_update(struct multi_context *m, const void *target, const char *msg, c

         const char *old_ipv6 = curr_mi->context.options.ifconfig_ipv6_local;

         if (!send_single_push_update(&curr_mi->context, msgs, &option_types_found))

         {

-            msg(M_CLIENT, "ERROR: Peer ID: %u has not been updated",

-                curr_mi->context.c2.tls_multi ? curr_mi->context.c2.tls_multi->peer_id : UINT32_MAX);

+            msg(M_CLIENT, "ERROR: Peer ID: %u has not been updated", curr_mi->context.c2.tls_multi->peer_id);

             continue;

         }

         if (option_types_found & OPT_P_UP)

@@ -144,7 +144,13 @@ mroute_extract_openvpn_sockaddr(struct mroute_addr *addr,

 {

     return true;

 }

-#endif /* ifndef ENABLE_MANAGEMENT */

+

+unsigned int

+extract_iv_proto(const char *peer_info)

+{

+    return IV_PROTO_PUSH_UPDATE;

+}

+#endif /* ifdef ENABLE_MANAGEMENT */

 /* tests */

@@ -464,6 +470,7 @@ setup2(void **state)

     struct multi_context *m = calloc(1, sizeof(struct multi_context));

     m->instances = calloc(1, sizeof(struct multi_instance *));

     struct multi_instance *mi = calloc(1, sizeof(struct multi_instance));

+    mi->context.c2.tls_multi = calloc(1, sizeof(struct tls_multi));

     *(m->instances) = mi;

     m->top.options.disable_dco = true;

     *state = m;

@@ -474,6 +481,7 @@ static int

 teardown2(void **state)

 {

     struct multi_context *m = *state;

+    free((*(m->instances))->context.c2.tls_multi);

     free(*(m->instances));

     free(m->instances);

     free(m);