[svn-commits] file: trunk r394370 - in /trunk: include/asterisk/ res/

[SVN commits to the Digium repositories]

Author: file
Date: Mon Jul 15 08:43:37 2013
New Revision: 394370

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=394370
Log:
Remove some callbacks and functions which are not needed.

Modified:
    trunk/include/asterisk/res_sip_session.h
    trunk/res/res_sip_session.c

Modified: trunk/include/asterisk/res_sip_session.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_sip_session.h?view=diff&rev=394370&r1=394369&r2=394370
==============================================================================
--- trunk/include/asterisk/res_sip_session.h (original)
+++ trunk/include/asterisk/res_sip_session.h Mon Jul 15 08:43:37 2013
@@ -411,20 +411,6 @@
 void ast_sip_session_remove_datastore(struct ast_sip_session *session, const char *name);
 
 /*!
- * \brief Retrieve identifying information from an incoming request
- *
- * This will retrieve identifying information and place it in the
- * id parameter. The caller of the function can then apply this to
- * caller ID, connected line, or whatever else may be proper.
- *
- * \param rdata The incoming request or response
- * \param[out] id The collected identity information
- * \retval 0 Successfully found identifying information
- * \retval -1 Identifying information could not be found
- */
-int ast_sip_session_get_identity(struct pjsip_rx_data *rdata, struct ast_party_id *id);
-
-/*!
  * \brief Send a reinvite or UPDATE on a session
  *
  * This method will inspect the session in order to construct an appropriate

Modified: trunk/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_sip_session.c?view=diff&rev=394370&r1=394369&r2=394370
==============================================================================
--- trunk/res/res_sip_session.c (original)
+++ trunk/res/res_sip_session.c Mon Jul 15 08:43:37 2013
@@ -590,23 +590,6 @@
 	ao2_callback(session->datastores, OBJ_KEY | OBJ_UNLINK | OBJ_NODATA, NULL, (void *) name);
 }
 
-int ast_sip_session_get_identity(struct pjsip_rx_data *rdata, struct ast_party_id *id)
-{
-	/* XXX STUB
-	 * This is low-priority as far as getting SIP working is concerned, so this
-	 * will be addressed later.
-	 *
-	 * The idea here will be that the rdata will be examined for headers such as
-	 * P-Asserted-Identity, Remote-Party-ID, and From in order to determine Identity
-	 * information.
-	 *
-	 * For reference, Asterisk SCF code does something very similar to this, except in
-	 * C++ and using its version of the ast_party_id struct, so using it as a basis
-	 * would be a smart idea here.
-	 */
-	return 0;
-}
-
 /*!
  * \brief Structure used for sending delayed requests
  *
@@ -773,19 +756,11 @@
 	return;
 }
 
-static pj_status_t session_load(pjsip_endpoint *endpt);
-static pj_status_t session_start(void);
-static pj_status_t session_stop(void);
-static pj_status_t session_unload(void);
 static pj_bool_t session_on_rx_request(pjsip_rx_data *rdata);
 
 static pjsip_module session_module = {
 	.name = {"Session Module", 14},
 	.priority = PJSIP_MOD_PRIORITY_APPLICATION,
-	.load = session_load,
-	.unload = session_unload,
-	.start = session_start,
-	.stop = session_stop,
 	.on_rx_request = session_on_rx_request,
 };
 
@@ -825,50 +800,6 @@
 		return -1;
 	}
 	return 0;
-}
-
-/*!
- * \brief Called when the PJSIP core loads us
- *
- * Since we already have Asterisk's fine module load/unload framework
- * in use, we don't need to do anything special here.
- */
-static pj_status_t session_load(pjsip_endpoint *endpt)
-{
-	return PJ_SUCCESS;
-}
-
-/*!
- * \brief Called when the PJSIP core starts us
- *
- * Since we already have Asterisk's fine module load/unload framework
- * in use, we don't need to do anything special here.
- */
-static pj_status_t session_start(void)
-{
-	return PJ_SUCCESS;
-}
-
-/*!
- * \brief Called when the PJSIP core stops us
- *
- * Since we already have Asterisk's fine module load/unload framework
- * in use, we don't need to do anything special here.
- */
-static pj_status_t session_stop(void)
-{
-	return PJ_SUCCESS;
-}
-
-/*!
- * \brief Called when the PJSIP core unloads us
- *
- * Since we already have Asterisk's fine module load/unload framework
- * in use, we don't need to do anything special here.
- */
-static pj_status_t session_unload(void)
-{
-	return PJ_SUCCESS;
 }
 
 static int datastore_hash(const void *obj, int flags)