Merge "threadpool, res_pjsip: Add serializer group shutdown API calls."
authorMatt Jordan <mjordan@digium.com>
Fri, 26 Jun 2015 18:36:17 +0000 (13:36 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 26 Jun 2015 18:36:17 +0000 (13:36 -0500)
1  2 
res/res_pjsip.c

diff --combined res/res_pjsip.c
                                <configOption name="rewrite_contact">
                                        <synopsis>Allow Contact header to be rewritten with the source IP address-port</synopsis>
                                        <description><para>
 -                                              On inbound SIP messages from this endpoint, the Contact header will be changed to have the
 -                                              source IP address and port. This option does not affect outbound messages send to this
 -                                              endpoint.
 +                                              On inbound SIP messages from this endpoint, the Contact header or an appropriate Record-Route
 +                                              header will be changed to have the source IP address and port. This option does not affect
 +                                              outbound messages sent to this endpoint.
                                        </para></description>
                                </configOption>
                                <configOption name="rtp_ipv6" default="no">
@@@ -3327,20 -3327,25 +3327,25 @@@ int ast_sip_append_body(pjsip_tx_data *
        return 0;
  }
  
- struct ast_taskprocessor *ast_sip_create_serializer(void)
+ struct ast_taskprocessor *ast_sip_create_serializer_group(struct ast_serializer_shutdown_group *shutdown_group)
  {
        struct ast_taskprocessor *serializer;
        char name[AST_UUID_STR_LEN];
  
        ast_uuid_generate_str(name, sizeof(name));
  
-       serializer = ast_threadpool_serializer(name, sip_threadpool);
+       serializer = ast_threadpool_serializer_group(name, sip_threadpool, shutdown_group);
        if (!serializer) {
                return NULL;
        }
        return serializer;
  }
  
+ struct ast_taskprocessor *ast_sip_create_serializer(void)
+ {
+       return ast_sip_create_serializer_group(NULL);
+ }
  /*!
   * \internal
   * \brief Shutdown the serializers in the default pool.