Changeset 08c48d7 in mod_gnutls for src/gnutls_hooks.c

Timestamp:

Jan 2, 2019, 3:22:48 PM (2 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, debian/master, master, proxy-ticket

Children:

4d38cbd

Parents:

c7710cf

Message:

Extract code for turning APR array of strings into gnutls_datum_t array

Having it as a separate function will allow sharing the code between
server and client (proxy) side ALPN proposal handling.

File:

• src/gnutls_hooks.c (modified) (1 diff)

src/gnutls_hooks.c

@@ -198 +198 @@
                   apr_array_pstrcat(ctxt->c->pool, pupgrades, ','));
     gnutls_datum_t *alpn_protos =
-        apr_palloc(ctxt->c->pool,
-                   (pupgrades->nelts + 1) * sizeof(gnutls_datum_t));
-    for (int i = 0; i < pupgrades->nelts; i++)
-    {
-        alpn_protos[i].data = (void *) APR_ARRAY_IDX(pupgrades, i, char *);
-        alpn_protos[i].size =
-            strnlen(APR_ARRAY_IDX(pupgrades, i, char *),
-                    pupgrades->elt_size);
-    }
+        mgs_str_array_to_datum_array(pupgrades,
+                                     ctxt->c->pool,
+                                     pupgrades->nelts + 1);
 
     /* Add the current (default) protocol at the end of the list */