res_pjsip: Add support for dnsmgr to external_media_address.

The "external_media_address" option on transports is now
resolved using dnsmgr. This allows it to be automatically
refreshed regularly if refreshes are enabled in dnsmgr.
If the system is using a dynamic IP address a dynamic DNS
hostname can be provided to keep the IP address up to
date.

Change-Id: Ia54771720dff0105bde55d5bbb81a3ba437e05b2

diff --git a/CHANGES b/CHANGES
index cce7f3335d547ae9aeae6fa01d46dce368e106c6..be4cadb5267ee08a81b7c30c082c443762970017 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,12 @@ Core
  * VP9 is now a supported passthrough video codec and it can be used by
    specifying "vp9" in the allow line.
 
+res_pjsip
+------------------
+ * The "external_media_address" on transports is now resolved using dnsmgr and
+   when dnsmgr refreshes are enabled will be automatically updated with the new
+   IP address of a given hostname.
+
 res_musiconhold
 ------------------
  * By default, when res_musiconhold reloads or unloads, it sends a HUP signal

diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index e23982781f646a81c8a27084ab90f576d358655a..3533ef27a42e3913c9fe675e1b0822a38db2ba66 100644 (file)
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -103,15 +103,25 @@ struct ast_sip_transport_state {
         */
        struct ast_ha *localnet;
        /*!
-        * DNS manager for refreshing the external address
+        * DNS manager for refreshing the external signaling address
         * \since 13.8.0
         */
-       struct ast_dnsmgr_entry *external_address_refresher;
+       struct ast_dnsmgr_entry *external_signaling_address_refresher;
        /*!
-        * Optional external address information
+        * Optional external signaling address information
         * \since 13.8.0
         */
-       struct ast_sockaddr external_address;
+       struct ast_sockaddr external_signaling_address;
+       /*!
+        * DNS manager for refreshing the external media address
+        * \since 13.18.0
+        */
+       struct ast_dnsmgr_entry *external_media_address_refresher;
+       /*!
+        * Optional external signaling address information
+        * \since 13.18.0
+        */
+       struct ast_sockaddr external_media_address;
 };
 
 /*

diff --git a/res/res_pjsip/config_transport.c b/res/res_pjsip/config_transport.c
index 62bc9d67db258f7c36b5c47d021c4276ab838c22..5f7eafa1c4deed04111e7449a71e310d5ce2cc33 100644 (file)
--- a/res/res_pjsip/config_transport.c
+++ b/res/res_pjsip/config_transport.c
@@ -248,8 +248,11 @@ static int destroy_sip_transport_state(void *data)
        ast_free(transport_state->id);
        ast_free_ha(transport_state->localnet);
 
-       if (transport_state->external_address_refresher) {
-               ast_dnsmgr_release(transport_state->external_address_refresher);
+       if (transport_state->external_signaling_address_refresher) {
+               ast_dnsmgr_release(transport_state->external_signaling_address_refresher);
+       }
+       if (transport_state->external_media_address_refresher) {
+               ast_dnsmgr_release(transport_state->external_media_address_refresher);
        }
        if (transport_state->transport) {
                pjsip_transport_shutdown(transport_state->transport);
@@ -399,8 +402,8 @@ static void copy_state_to_transport(struct ast_sip_transport *transport)
        memcpy(&transport->tls, &transport->state->tls, sizeof(transport->tls));
        memcpy(&transport->ciphers, &transport->state->ciphers, sizeof(transport->ciphers));
        transport->localnet = transport->state->localnet;
-       transport->external_address_refresher = transport->state->external_address_refresher;
-       memcpy(&transport->external_address, &transport->state->external_address, sizeof(transport->external_address));
+       transport->external_address_refresher = transport->state->external_signaling_address_refresher;
+       memcpy(&transport->external_address, &transport->state->external_signaling_address, sizeof(transport->external_signaling_address));
 }
 
 static int has_state_changed(struct ast_sip_transport_state *a, struct ast_sip_transport_state *b)
@@ -421,7 +424,11 @@ static int has_state_changed(struct ast_sip_transport_state *a, struct ast_sip_t
                return -1;
        }
 
-       if (ast_sockaddr_cmp(&a->external_address, &b->external_address)) {
+       if (ast_sockaddr_cmp(&a->external_signaling_address, &b->external_signaling_address)) {
+               return -1;
+       }
+
+       if (ast_sockaddr_cmp(&a->external_media_address, &b->external_media_address)) {
                return -1;
        }
 
@@ -515,24 +522,41 @@ static int transport_apply(const struct ast_sorcery *sorcery, void *obj)
                pj_sockaddr_set_port(&temp_state->state->host, (transport->type == AST_TRANSPORT_TLS) ? 5061 : 5060);
        }
 
-       /* Now that we know what address family we can set up a dnsmgr refresh for the external media address if present */
+       /* Now that we know what address family we can set up a dnsmgr refresh for the external addresses if present */
        if (!ast_strlen_zero(transport->external_signaling_address)) {
                if (temp_state->state->host.addr.sa_family == pj_AF_INET()) {
-                       temp_state->state->external_address.ss.ss_family = AF_INET;
+                       temp_state->state->external_signaling_address.ss.ss_family = AF_INET;
                } else if (temp_state->state->host.addr.sa_family == pj_AF_INET6()) {
-                       temp_state->state->external_address.ss.ss_family = AF_INET6;
+                       temp_state->state->external_signaling_address.ss.ss_family = AF_INET6;
                } else {
                        ast_log(LOG_ERROR, "Unknown address family for transport '%s', could not get external signaling address\n",
                                        transport_id);
                        return -1;
                }
 
-               if (ast_dnsmgr_lookup(transport->external_signaling_address, &temp_state->state->external_address, &temp_state->state->external_address_refresher, NULL) < 0) {
+               if (ast_dnsmgr_lookup(transport->external_signaling_address, &temp_state->state->external_signaling_address, &temp_state->state->external_signaling_address_refresher, NULL) < 0) {
                        ast_log(LOG_ERROR, "Could not create dnsmgr for external signaling address on '%s'\n", transport_id);
                        return -1;
                }
        }
 
+       if (!ast_strlen_zero(transport->external_media_address)) {
+               if (temp_state->state->host.addr.sa_family == pj_AF_INET()) {
+                       temp_state->state->external_media_address.ss.ss_family = AF_INET;
+               } else if (temp_state->state->host.addr.sa_family == pj_AF_INET6()) {
+                       temp_state->state->external_media_address.ss.ss_family = AF_INET6;
+               } else {
+                       ast_log(LOG_ERROR, "Unknown address family for transport '%s', could not get external media address\n",
+                                       transport_id);
+                       return -1;
+               }
+
+               if (ast_dnsmgr_lookup(transport->external_media_address, &temp_state->state->external_media_address, &temp_state->state->external_media_address_refresher, NULL) < 0) {
+                       ast_log(LOG_ERROR, "Could not create dnsmgr for external media address on '%s'\n", transport_id);
+                       return -1;
+               }
+       }
+
        if (transport->type == AST_TRANSPORT_UDP) {
 
                for (i = 0; i < BIND_TRIES && res != PJ_SUCCESS; i++) {

diff --git a/res/res_pjsip_nat.c b/res/res_pjsip_nat.c
index a0ce2a9d1e51b123283715b7f88fab65d5a73a85..3847de737fdd2fe2db2a1747c786f4103f6a62bf 100644 (file)
--- a/res/res_pjsip_nat.c
+++ b/res/res_pjsip_nat.c
@@ -273,10 +273,10 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
                }
        }
 
-       if (!ast_sockaddr_isnull(&transport_state->external_address)) {
+       if (!ast_sockaddr_isnull(&transport_state->external_signaling_address)) {
                /* Update the contact header with the external address */
                if (uri || (uri = nat_get_contact_sip_uri(tdata))) {
-                       pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_address));
+                       pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_signaling_address));
                        if (transport->external_signaling_port) {
                                uri->port = transport->external_signaling_port;
                                ast_debug(4, "Re-wrote Contact URI port to %d\n", uri->port);
@@ -285,7 +285,7 @@ static pj_status_t nat_on_tx_message(pjsip_tx_data *tdata)
 
                /* Update the via header if relevant */
                if ((tdata->msg->type == PJSIP_REQUEST_MSG) && (via || (via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL)))) {
-                       pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport_state->external_address));
+                       pj_strdup2(tdata->pool, &via->sent_by.host, ast_sockaddr_stringify_host(&transport_state->external_signaling_address));
                        if (transport->external_signaling_port) {
                                via->sent_by.port = transport->external_signaling_port;
                        }

diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c
index a7c1b7cc900d3488e11500873f413f1d045fef0d..4f356d191f122f955d8201cdb9d520a28170a633 100644 (file)
--- a/res/res_pjsip_sdp_rtp.c
+++ b/res/res_pjsip_sdp_rtp.c
@@ -1520,8 +1520,8 @@ static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struc
                && ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW) {
                return;
        }
-       ast_debug(5, "Setting media address to %s\n", transport->external_media_address);
-       pj_strdup2(tdata->pool, &stream->conn->addr, transport->external_media_address);
+       ast_debug(5, "Setting media address to %s\n", ast_sockaddr_stringify_host(&transport_state->external_media_address));
+       pj_strdup2(tdata->pool, &stream->conn->addr, ast_sockaddr_stringify_host(&transport_state->external_media_address));
 }
 
 /*! \brief Function which stops the RTP instance */

diff --git a/res/res_pjsip_session.c b/res/res_pjsip_session.c
index c1684ed36c59a4b38313aa7f3953eabaec569bad..9cb80384c38378f0b67e1460b4d26cc9b08be55a 100644 (file)
--- a/res/res_pjsip_session.c
+++ b/res/res_pjsip_session.c
@@ -3152,8 +3152,8 @@ static void session_outgoing_nat_hook(pjsip_tx_data *tdata, struct ast_sip_trans
 
                if (!transport_state->localnet
                        || ast_apply_ha(transport_state->localnet, &addr) != AST_SENSE_ALLOW) {
-                       ast_debug(5, "Setting external media address to %s\n", transport->external_media_address);
-                       pj_strdup2(tdata->pool, &sdp->conn->addr, transport->external_media_address);
+                       ast_debug(5, "Setting external media address to %s\n", ast_sockaddr_stringify_host(&transport_state->external_media_address));
+                       pj_strdup2(tdata->pool, &sdp->conn->addr, ast_sockaddr_stringify_host(&transport_state->external_media_address));
                }
        }
 

diff --git a/res/res_pjsip_t38.c b/res/res_pjsip_t38.c
index 91af292c1d90471cc5256d199a4b18502255d62f..648c7535450bc809c3dcc82ad25164e96d4473b0 100644 (file)
--- a/res/res_pjsip_t38.c
+++ b/res/res_pjsip_t38.c
@@ -885,8 +885,8 @@ static void change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struc
                && ast_apply_ha(transport_state->localnet, &addr) == AST_SENSE_ALLOW) {
                return;
        }
-       ast_debug(5, "Setting media address to %s\n", transport->external_media_address);
-       pj_strdup2(tdata->pool, &stream->conn->addr, transport->external_media_address);
+       ast_debug(5, "Setting media address to %s\n", ast_sockaddr_stringify_host(&transport_state->external_media_address));
+       pj_strdup2(tdata->pool, &stream->conn->addr, ast_sockaddr_stringify_host(&transport_state->external_media_address));
 }
 
 /*! \brief Function which destroys the UDPTL instance when session ends */