stringfields: Collect extended stringfields into the stringfield section.

Use of extended stringfields is a temporary mechanism to avoid ABI
breakage in released branches without resorting to more inconvienient
methods.

* Collect existing extended stringfields into the parent stringfield
section of the struct.

Change-Id: I8d46d037801b4518837c3ea4b6df95ceadc9436b

diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h
index 092bb842095dfdebbc582f5374887f9fcd137db3..d2ae39baf05b0f8d2acaf25a51cc3979bc90b6e0 100644 (file)
--- a/include/asterisk/res_pjsip.h
+++ b/include/asterisk/res_pjsip.h
@@ -258,6 +258,14 @@ struct ast_sip_contact {
                AST_STRING_FIELD(user_agent);
                /*! The name of the aor this contact belongs to */
                AST_STRING_FIELD(aor);
+               /*! Asterisk Server name */
+               AST_STRING_FIELD(reg_server);
+               /*! IP-address of the Via header in REGISTER request */
+               AST_STRING_FIELD(via_addr);
+               /*! Content of the Call-ID header in REGISTER request */
+               AST_STRING_FIELD(call_id);
+               /*! The name of the endpoint that added the contact */
+               AST_STRING_FIELD(endpoint_name);
        );
        /*! Absolute time that this contact is no longer valid after */
        struct timeval expiration_time;
@@ -269,16 +277,8 @@ struct ast_sip_contact {
        double qualify_timeout;
        /*! Endpoint that added the contact, only available in observers */
        struct ast_sip_endpoint *endpoint;
-       /*! Asterisk Server name */
-       AST_STRING_FIELD_EXTENDED(reg_server);
-       /*! IP-address of the Via header in REGISTER request */
-       AST_STRING_FIELD_EXTENDED(via_addr);
-       /* Port of the Via header in REGISTER request */
+       /*! Port of the Via header in REGISTER request */
        int via_port;
-       /*! Content of the Call-ID header in REGISTER request */
-       AST_STRING_FIELD_EXTENDED(call_id);
-       /*! The name of the endpoint that added the contact */
-       AST_STRING_FIELD_EXTENDED(endpoint_name);
        /*! If true delete the contact on Asterisk restart/boot */
        int prune_on_boot;
 };
@@ -751,6 +751,8 @@ struct ast_sip_endpoint {
                AST_STRING_FIELD(message_context);
                /*! Accountcode to auto-set on channels */
                AST_STRING_FIELD(accountcode);
+               /*! If set, we'll push incoming MWI NOTIFYs to stasis using this mailbox */
+               AST_STRING_FIELD(incoming_mwi_mailbox);
        );
        /*! Configuration for extensions */
        struct ast_sip_endpoint_extensions extensions;
@@ -812,8 +814,6 @@ struct ast_sip_endpoint {
        unsigned int refer_blind_progress;
        /*! Whether to notifies dialog-info 'early' on INUSE && RINGING state */
        unsigned int notify_early_inuse_ringing;
-       /*! If set, we'll push incoming MWI NOTIFYs to stasis using this mailbox */
-       AST_STRING_FIELD_EXTENDED(incoming_mwi_mailbox);
 };
 
 /*! URI parameter for symmetric transport */

diff --git a/include/asterisk/stasis_bridges.h b/include/asterisk/stasis_bridges.h
index 05d356cc2c144a7d4cbb6d07f442dc100e68b8df..a455a5b02656c86b9e3b551b646304ddd7fc0cf4 100644 (file)
--- a/include/asterisk/stasis_bridges.h
+++ b/include/asterisk/stasis_bridges.h
@@ -46,6 +46,8 @@ struct ast_bridge_snapshot {
                AST_STRING_FIELD(creator);
                /*! Name given to the bridge by its creator */
                AST_STRING_FIELD(name);
+               /*! Unique ID of the channel providing video, if one exists */
+               AST_STRING_FIELD(video_source_id);
        );
        /*! AO2 container of bare channel uniqueid strings participating in the bridge.
         * Allocated from ast_str_container_alloc() */
@@ -60,8 +62,6 @@ struct ast_bridge_snapshot {
        unsigned int num_active;
        /*! The video mode of the bridge */
        enum ast_bridge_video_mode_type video_mode;
-       /*! Unique ID of the channel providing video, if one exists */
-       AST_STRING_FIELD_EXTENDED(video_source_id);
 };
 
 /*!

diff --git a/main/stasis_bridges.c b/main/stasis_bridges.c
index 4b68559de95d5ae1de4f7a68a7d375a51105a33f..59b9685ef3191492d425057b2739f1207e8d88ab 100644 (file)
--- a/main/stasis_bridges.c
+++ b/main/stasis_bridges.c
@@ -246,8 +246,7 @@ struct ast_bridge_snapshot *ast_bridge_snapshot_create(struct ast_bridge *bridge
                return NULL;
        }
 
-       if (ast_string_field_init(snapshot, 128)
-               || ast_string_field_init_extended(snapshot, video_source_id)) {
+       if (ast_string_field_init(snapshot, 128)) {
                ao2_ref(snapshot, -1);
 
                return NULL;

diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c
index 22da805774cf248c1cd8246fd1a4353b82bffbaa..6e79dc40b0ef0ce6fe6a5383bf328c508fadf550 100644 (file)
--- a/res/res_pjsip/location.c
+++ b/res/res_pjsip/location.c
@@ -133,11 +133,6 @@ static void *contact_alloc(const char *name)
                return NULL;
        }
 
-       ast_string_field_init_extended(contact, endpoint_name);
-       ast_string_field_init_extended(contact, reg_server);
-       ast_string_field_init_extended(contact, via_addr);
-       ast_string_field_init_extended(contact, call_id);
-
        /* Dynamic contacts are delimited with ";@" and static ones with "@@" */
        if ((aor_separator = strstr(id, ";@")) || (aor_separator = strstr(id, "@@"))) {
                *aor_separator = '\0';

diff --git a/res/res_pjsip/pjsip_configuration.c b/res/res_pjsip/pjsip_configuration.c
index 3094f248eb50728d83b3e41716d447896d8e0981..fb84a1f608f8b5956ad800b1023347e87242e2db 100644 (file)
--- a/res/res_pjsip/pjsip_configuration.c
+++ b/res/res_pjsip/pjsip_configuration.c
@@ -2248,8 +2248,6 @@ void *ast_sip_endpoint_alloc(const char *name)
                return NULL;
        }
 
-       ast_string_field_init_extended(endpoint, incoming_mwi_mailbox);
-
        if (!(endpoint->media.codecs = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
                ao2_cleanup(endpoint);
                return NULL;