diff options
Diffstat (limited to 'pjsip/include')
-rw-r--r-- | pjsip/include/pjsip/sip_endpoint.h | 50 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_module.h | 7 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_transaction.h | 2 | ||||
-rw-r--r-- | pjsip/include/pjsip/sip_ua_layer.h | 4 |
4 files changed, 13 insertions, 50 deletions
diff --git a/pjsip/include/pjsip/sip_endpoint.h b/pjsip/include/pjsip/sip_endpoint.h index ef9d44c9..8b344db8 100644 --- a/pjsip/include/pjsip/sip_endpoint.h +++ b/pjsip/include/pjsip/sip_endpoint.h @@ -45,15 +45,12 @@ PJ_BEGIN_DECL * - it manages the allocation/deallocation of memory pools for all objects. * - it manages listeners and transports, and how they are used by * transactions. - * - it owns transaction hash table. * - it receives incoming messages from transport layer and automatically * dispatches them to the correct transaction (or create a new one). * - it has a single instance of timer management (timer heap). * - it manages modules, which is the primary means of extending the library. * - it provides single polling function for all objects and distributes * events. - * - it provides SIP policy such as which outbound proxy to use for all - * outgoing SIP request messages. * - it automatically handles incoming requests which can not be handled by * existing modules (such as when incoming request has unsupported method). * - and so on.. @@ -144,18 +141,6 @@ PJ_DECL(void) pjsip_endpt_cancel_timer( pjsip_endpoint *endpt, /** - * Dump endpoint status to the log. This will print the status to the log - * with log level 3. - * - * @param endpt The endpoint. - * @param detail If non zero, then it will dump a detailed output. - * BEWARE that this option may crash the system because - * it tries to access all memory pools. - */ -PJ_DECL(void) pjsip_endpt_dump( pjsip_endpoint *endpt, pj_bool_t detail ); - - -/** * Register new module to the endpoint. * The endpoint will then call the load and start function in the module to * properly initialize the module, and assign a unique module ID for the @@ -394,6 +379,7 @@ PJ_DECL(pj_status_t) pjsip_endpt_add_capability( pjsip_endpoint *endpt, /** * Get list of additional headers to be put in outgoing request message. + * Currently only Max-Forwards are defined. * * @param e The endpoint. * @@ -403,35 +389,17 @@ PJ_DECL(const pjsip_hdr*) pjsip_endpt_get_request_headers(pjsip_endpoint *e); /** - * Set list of SIP proxies to be visited for all outbound request messages. - * Application can call this function to specify how outgoing request messages - * should be routed. For example, if outgoing requests should go through an - * outbound proxy, then application can specify the URL of the proxy when - * calling this function. More than one proxy can be specified, and the - * order of which proxy is specified when calling this function specifies - * the order of which proxy will be visited first by the request messages. - * - * @param endpt The endpoint instance. - * @param url_cnt Number of proxies/URLs in the array. - * @param url Array of proxy URL, which specifies the order of which - * proxy will be visited first (e.g. url[0] will be visited - * before url[1]). + * Dump endpoint status to the log. This will print the status to the log + * with log level 3. * - * @return Zero on success. + * @param endpt The endpoint. + * @param detail If non zero, then it will dump a detailed output. + * BEWARE that this option may crash the system because + * it tries to access all memory pools. */ -PJ_DECL(pj_status_t) pjsip_endpt_set_proxies( pjsip_endpoint *endpt, - int url_cnt, const pj_str_t url[]); +PJ_DECL(void) pjsip_endpt_dump( pjsip_endpoint *endpt, pj_bool_t detail ); + -/** - * Get the list of "Route" header that are configured for this endpoint. - * The "Route" header specifies how outbound request messages will be sent, - * and is built when application sets the outbound proxy. - * - * @param endpt The endpoint instance. - * - * @return List of "Route" header. - */ -PJ_DECL(const pjsip_route_hdr*) pjsip_endpt_get_routing( pjsip_endpoint *endpt ); /** * Log an error. diff --git a/pjsip/include/pjsip/sip_module.h b/pjsip/include/pjsip/sip_module.h index 57d1652d..94e3002c 100644 --- a/pjsip/include/pjsip/sip_module.h +++ b/pjsip/include/pjsip/sip_module.h @@ -63,12 +63,6 @@ struct pjsip_module int priority; /** - * Opaque data which can be used by a module to identify a resource within - * the module itself. - */ - void *user_data; - - /** * Pointer to function to be called to initialize the module. * * @param endpt The endpoint instance. @@ -166,6 +160,7 @@ enum pjsip_module_priority PJSIP_MOD_PRIORITY_TRANSPORT_LAYER = 8, PJSIP_MOD_PRIORITY_TSX_LAYER = 16, PJSIP_MOD_PRIORITY_UA_PROXY_LAYER = 32, + PJSIP_MOD_PRIORITY_DIALOG_USAGE = 48, PJSIP_MOD_PRIORITY_APPLICATION = 64, }; diff --git a/pjsip/include/pjsip/sip_transaction.h b/pjsip/include/pjsip/sip_transaction.h index 33e39c18..1ffcbc3c 100644 --- a/pjsip/include/pjsip/sip_transaction.h +++ b/pjsip/include/pjsip/sip_transaction.h @@ -120,7 +120,7 @@ struct pjsip_transaction * * @return PJ_SUCCESS on success. */ -PJ_DECL(pj_status_t) pjsip_tsx_layer_init(pjsip_endpoint *endpt); +PJ_DECL(pj_status_t) pjsip_tsx_layer_init_module(pjsip_endpoint *endpt); /** * Get the instance of the transaction layer module. diff --git a/pjsip/include/pjsip/sip_ua_layer.h b/pjsip/include/pjsip/sip_ua_layer.h index 012628a5..983efb5d 100644 --- a/pjsip/include/pjsip/sip_ua_layer.h +++ b/pjsip/include/pjsip/sip_ua_layer.h @@ -55,8 +55,8 @@ typedef struct pjsip_ua_init_param * * @return PJ_SUCCESS on success. */ -PJ_DECL(pj_status_t) pjsip_ua_init(pjsip_endpoint *endpt, - const pjsip_ua_init_param *prm); +PJ_DECL(pj_status_t) pjsip_ua_init_module(pjsip_endpoint *endpt, + const pjsip_ua_init_param *prm); /** * Get the instance of the user agent. |