Fix build with latest ubuntu-24.04:

  assigning to 'char *' from 'const char *' discards qualifier

Author: sobomax

extractaudio/srtp_util.c

@@ -56,7 +56,7 @@ static int base64_block_to_octet_triple (char *out, char *in)
     int i;
 
     for (i = 0; i < 4; i++) {
-        char *p = strchr(b64chars, in[i]);
+        const char *p = strchr(b64chars, in[i]);
         if (p != NULL) {
             sextets[i] = p - b64chars;
         } else{  j++; }

pertools/udp_contention/udp_contention.c

@@ -97,7 +97,7 @@ struct tconf {
     int paylen_max;
     struct addrinfo *dstaddrs;
     int ndstaddrs;
-    const char *dstaddr;
+    char *dstaddr;
     int dstnetpref;
     int test_kind;
     uint64_t magic;

src/rtpp_bindargs.h

@@ -35,7 +35,7 @@ struct rtpp_bindaddr_params;
 #define BINDARG_MAX     16
 
 struct bindarg {
-    const char *h;
+    char *h;
     struct rtpp_bindaddr_params params;
     int is_v6;
 };

src/rtpp_controlfd.c

@@ -134,28 +134,47 @@ controlfd_init_ifsun(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *csp)
 }
 
 static int
-controlfd_init_udp(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *csp)
+controlfd_setbindhost(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *csp,
+  struct sockaddr *ifsin, int af)
 {
-    struct sockaddr *ifsin;
-    char *cp, *tcp = NULL;
-    int controlfd, so_rcvbuf, i, r;
+    const char *cp, *bindhost, *port;
+    char *bindhost_buf;
+    size_t bindhost_len;
+    int r;
 
     cp = strrchr(csp->cmd_sock, ':');
     if (cp != NULL) {
-        *cp = '\0';
-        tcp = cp;
-        cp++;
+        bindhost_len = cp - csp->cmd_sock;
+        bindhost_buf = alloca(bindhost_len + 1);
+        memcpy(bindhost_buf, csp->cmd_sock, bindhost_len);
+        bindhost_buf[bindhost_len] = '\0';
+        bindhost = bindhost_buf;
+        port = cp + 1;
+    } else {
+        bindhost = csp->cmd_sock;
+        port = CPORT;
     }
-    if (cp == NULL || *cp == '\0')
-        cp = CPORT;
-    csp->port_ctl = atoi(cp);
+    if (*port == '\0')
+        port = CPORT;
+    csp->port_ctl = atoi(port);
+    r = setbindhost(ifsin, af, bindhost, port, cfsp->no_resolve);
+    if (r != 0) {
+        warnx("setbindhost failed");
+        return (-1);
+    }
+    return (0);
+}
+
+static int
+controlfd_init_udp(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *csp)
+{
+    struct sockaddr *ifsin;
+    int controlfd, so_rcvbuf, i, r;
+
     i = (csp->type == RTPC_UDP6) ? AF_INET6 : AF_INET;
     ifsin = sstosa(&csp->bindaddr);
-    r = setbindhost(ifsin, i, csp->cmd_sock, cp, cfsp->no_resolve);
-    if (tcp != NULL)
-        *tcp = ':';
+    r = controlfd_setbindhost(cfsp, csp, ifsin, i);
     if (r != 0) {
-        warnx("setbindhost failed");
         return (-1);
     }
     controlfd = socket(i, SOCK_DGRAM, 0);
@@ -179,25 +198,12 @@ static int
 controlfd_init_tcp(const struct rtpp_cfg *cfsp, struct rtpp_ctrl_sock *csp)
 {
     struct sockaddr *ifsin;
-    char *cp, *tcp = NULL;;
     int controlfd, so_rcvbuf, i, r;
 
-    cp = strrchr(csp->cmd_sock, ':');
-    if (cp != NULL) {
-        *cp = '\0';
-        tcp = cp;
-        cp++;
-    }
-    if (cp == NULL || *cp == '\0')
-        cp = CPORT;
-    csp->port_ctl = atoi(cp);
     i = (csp->type == RTPC_TCP6) ? AF_INET6 : AF_INET;
     ifsin = sstosa(&csp->bindaddr);
-    r = setbindhost(ifsin, i, csp->cmd_sock, cp, cfsp->no_resolve);
-    if (tcp != NULL)
-        *tcp = ':';
+    r = controlfd_setbindhost(cfsp, csp, ifsin, i);
     if (r != 0) {
-        warnx("setbindhost failed");
         return (-1);
     }
     controlfd = socket(i, SOCK_STREAM, 0);

src/rtpp_tnotify_set.c

@@ -379,7 +379,7 @@ rtpp_tnotify_set_lookup(struct rtpp_tnotify_set *pub, const char *socket_name,
     struct rtpp_tnotify_set_priv *pvt;
     struct rtpp_tnotify_wildcard *wp;
     int i;
-    char *sep;
+    const char *sep;
 
     PUB2PVT(pub, pvt);
     for (i = 0; i < pvt->tp_len; i++) {