[sr-dev] git:master:915b90d2: Merge branch 'master' of https://github.com/kamailio/kamailio.git

Module: kamailio Branch: master Commit: 915b90d22f21bdc0caeafbcdf1a5cc925bd4d2a0 URL: https://github.com/kamailio/kamailio/commit/915b90d22f21bdc0caeafbcdf1a5cc9… Author: Robert Boisvert <Robert.Boisvert(a)sequentialtech.com> Committer: Robert Boisvert <Robert.Boisvert(a)sequentialtech.com> Date: 2021-03-22T10:45:11-04:00 Merge branch 'master' of https://github.com/kamailio/kamailio.git --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/915b90d22f21bdc0caeafbcdf1a5cc9… Patch: https://github.com/kamailio/kamailio/commit/915b90d22f21bdc0caeafbcdf1a5cc9… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 8b751eb48a..7114b08d40 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1829,6 +1829,7 @@ static int build_rtpp_socks(int lmode, int rtest) { rtpe_reload_lock_get(rtpp_list->rset_lock); for (pnode=rtpp_list->rn_first; pnode!=0; pnode = pnode->rn_next) { char *hostname; + char *hp; if (pnode->rn_umode == 0) { rtpp_socks[pnode->idx] = -1; @@ -1860,11 +1861,23 @@ static int build_rtpp_socks(int lmode, int rtest) { if (cp == NULL || *cp == '\0') cp = CPORT; + if(pnode->rn_umode == 6) { + hp = strrchr(hostname, ']'); + if(hp != NULL) + *hp = '\0'; + + hp = hostname; + if(*hp == '[') + hp++; + } else { + hp = hostname; + } + memset(&hints, 0, sizeof(hints)); hints.ai_flags = 0; hints.ai_family = (pnode->rn_umode == 6) ? AF_INET6 : AF_INET; hints.ai_socktype = SOCK_DGRAM; - if ((n = getaddrinfo(hostname, cp, &hints, &res)) != 0) { + if ((n = getaddrinfo(hp, cp, &hints, &res)) != 0) { LM_ERR("%s\n", gai_strerror(n)); pkg_free(hostname); rtpp_socks[pnode->idx] = -1;