<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8785">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Corey Farrell: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">stringfields: Collect extended stringfields into the stringfield section.<br><br>Use of extended stringfields is a temporary mechanism to avoid ABI<br>breakage in released branches without resorting to more inconvienient<br>methods.<br><br>* Collect existing extended stringfields into the parent stringfield<br>section of the struct.<br><br>Change-Id: I8d46d037801b4518837c3ea4b6df95ceadc9436b<br>---<br>M include/asterisk/res_pjsip.h<br>M include/asterisk/stasis_bridges.h<br>M main/stasis_bridges.c<br>M res/res_pjsip/location.c<br>M res/res_pjsip/pjsip_configuration.c<br>5 files changed, 14 insertions(+), 22 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h<br>index 092bb84..d2ae39b 100644<br>--- a/include/asterisk/res_pjsip.h<br>+++ b/include/asterisk/res_pjsip.h<br>@@ -258,6 +258,14 @@<br> AST_STRING_FIELD(user_agent);<br> /*! The name of the aor this contact belongs to */<br> AST_STRING_FIELD(aor);<br>+ /*! Asterisk Server name */<br>+ AST_STRING_FIELD(reg_server);<br>+ /*! IP-address of the Via header in REGISTER request */<br>+ AST_STRING_FIELD(via_addr);<br>+ /*! Content of the Call-ID header in REGISTER request */<br>+ AST_STRING_FIELD(call_id);<br>+ /*! The name of the endpoint that added the contact */<br>+ AST_STRING_FIELD(endpoint_name);<br> );<br> /*! Absolute time that this contact is no longer valid after */<br> struct timeval expiration_time;<br>@@ -269,16 +277,8 @@<br> double qualify_timeout;<br> /*! Endpoint that added the contact, only available in observers */<br> struct ast_sip_endpoint *endpoint;<br>- /*! Asterisk Server name */<br>- AST_STRING_FIELD_EXTENDED(reg_server);<br>- /*! IP-address of the Via header in REGISTER request */<br>- AST_STRING_FIELD_EXTENDED(via_addr);<br>- /* Port of the Via header in REGISTER request */<br>+ /*! Port of the Via header in REGISTER request */<br> int via_port;<br>- /*! Content of the Call-ID header in REGISTER request */<br>- AST_STRING_FIELD_EXTENDED(call_id);<br>- /*! The name of the endpoint that added the contact */<br>- AST_STRING_FIELD_EXTENDED(endpoint_name);<br> /*! If true delete the contact on Asterisk restart/boot */<br> int prune_on_boot;<br> };<br>@@ -751,6 +751,8 @@<br> AST_STRING_FIELD(message_context);<br> /*! Accountcode to auto-set on channels */<br> AST_STRING_FIELD(accountcode);<br>+ /*! If set, we'll push incoming MWI NOTIFYs to stasis using this mailbox */<br>+ AST_STRING_FIELD(incoming_mwi_mailbox);<br> );<br> /*! Configuration for extensions */<br> struct ast_sip_endpoint_extensions extensions;<br>@@ -812,8 +814,6 @@<br> unsigned int refer_blind_progress;<br> /*! Whether to notifies dialog-info 'early' on INUSE && RINGING state */<br> unsigned int notify_early_inuse_ringing;<br>- /*! If set, we'll push incoming MWI NOTIFYs to stasis using this mailbox */<br>- AST_STRING_FIELD_EXTENDED(incoming_mwi_mailbox);<br> };<br> <br> /*! URI parameter for symmetric transport */<br>diff --git a/include/asterisk/stasis_bridges.h b/include/asterisk/stasis_bridges.h<br>index 05d356c..a455a5b 100644<br>--- a/include/asterisk/stasis_bridges.h<br>+++ b/include/asterisk/stasis_bridges.h<br>@@ -46,6 +46,8 @@<br> AST_STRING_FIELD(creator);<br> /*! Name given to the bridge by its creator */<br> AST_STRING_FIELD(name);<br>+ /*! Unique ID of the channel providing video, if one exists */<br>+ AST_STRING_FIELD(video_source_id);<br> );<br> /*! AO2 container of bare channel uniqueid strings participating in the bridge.<br> * Allocated from ast_str_container_alloc() */<br>@@ -60,8 +62,6 @@<br> unsigned int num_active;<br> /*! The video mode of the bridge */<br> enum ast_bridge_video_mode_type video_mode;<br>- /*! Unique ID of the channel providing video, if one exists */<br>- AST_STRING_FIELD_EXTENDED(video_source_id);<br> };<br> <br> /*!<br>diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c<br>index 4b68559..59b9685 100644<br>--- a/main/stasis_bridges.c<br>+++ b/main/stasis_bridges.c<br>@@ -246,8 +246,7 @@<br> return NULL;<br> }<br> <br>- if (ast_string_field_init(snapshot, 128)<br>- || ast_string_field_init_extended(snapshot, video_source_id)) {<br>+ if (ast_string_field_init(snapshot, 128)) {<br> ao2_ref(snapshot, -1);<br> <br> return NULL;<br>diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c<br>index 22da805..6e79dc4 100644<br>--- a/res/res_pjsip/location.c<br>+++ b/res/res_pjsip/location.c<br>@@ -133,11 +133,6 @@<br> return NULL;<br> }<br> <br>- ast_string_field_init_extended(contact, endpoint_name);<br>- ast_string_field_init_extended(contact, reg_server);<br>- ast_string_field_init_extended(contact, via_addr);<br>- ast_string_field_init_extended(contact, call_id);<br>-<br> /* Dynamic contacts are delimited with ";@" and static ones with "@@" */<br> if ((aor_separator = strstr(id, ";@")) || (aor_separator = strstr(id, "@@"))) {<br> *aor_separator = '\0';<br>diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c<br>index 3094f24..fb84a1f 100644<br>--- a/res/res_pjsip/pjsip_configuration.c<br>+++ b/res/res_pjsip/pjsip_configuration.c<br>@@ -2248,8 +2248,6 @@<br> return NULL;<br> }<br> <br>- ast_string_field_init_extended(endpoint, incoming_mwi_mailbox);<br>-<br> if (!(endpoint->media.codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {<br> ao2_cleanup(endpoint);<br> return NULL;<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8785">change 8785</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8785"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I8d46d037801b4518837c3ea4b6df95ceadc9436b </div>
<div style="display:none"> Gerrit-Change-Number: 8785 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Richard Mudgett <rmudgett@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>