[asterisk-commits] file: branch file/pimp_sip_nat r382783 - in /team/file/pimp_sip_nat: include/...

[SVN commits to the Asterisk project]

Author: file
Date: Mon Mar 11 06:39:16 2013
New Revision: 382783

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382783
Log:
Change naming slightly.

Modified:
    team/file/pimp_sip_nat/include/asterisk/res_sip_session.h
    team/file/pimp_sip_nat/res/res_sip_sdp_audio.c
    team/file/pimp_sip_nat/res/res_sip_session.c

Modified: team/file/pimp_sip_nat/include/asterisk/res_sip_session.h
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_sip_nat/include/asterisk/res_sip_session.h?view=diff&rev=382783&r1=382782&r2=382783
==============================================================================
--- team/file/pimp_sip_nat/include/asterisk/res_sip_session.h (original)
+++ team/file/pimp_sip_nat/include/asterisk/res_sip_session.h Mon Mar 11 06:39:16 2013
@@ -198,7 +198,7 @@
 	 * \param stream The stream on which to operate
 	 * \param transport The transport the SDP is going out on
 	 */
-	void (*change_outgoing_sdp_stream)(struct pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport);
+	void (*change_outgoing_sdp_stream_media_address)(struct pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport);
 	/*!
 	 * \brief Apply a negotiated SDP media stream
 	 * \param session The session for which media is being applied

Modified: team/file/pimp_sip_nat/res/res_sip_sdp_audio.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_sip_nat/res/res_sip_sdp_audio.c?view=diff&rev=382783&r1=382782&r2=382783
==============================================================================
--- team/file/pimp_sip_nat/res/res_sip_sdp_audio.c (original)
+++ team/file/pimp_sip_nat/res/res_sip_sdp_audio.c Mon Mar 11 06:39:16 2013
@@ -65,7 +65,7 @@
 static int audio_create_outgoing_sdp_stream(struct ast_sip_session *session, struct pjmedia_sdp_session *sdp);
 static int audio_apply_negotiated_sdp_stream(struct ast_sip_session *session, const struct pjmedia_sdp_session *local, const struct pjmedia_sdp_media *local_stream,
 	const struct pjmedia_sdp_session *remote, const struct pjmedia_sdp_media *remote_stream);
-static void audio_change_outgoing_sdp_stream(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport);
+static void audio_change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport);
 
 /*! \brief Forward declaration for session supplement functions */
 static void audio_session_destroy(struct ast_sip_session *session);
@@ -76,7 +76,7 @@
 	.negotiate_incoming_sdp_stream = audio_negotiate_incoming_sdp_stream,
 	.create_outgoing_sdp_stream = audio_create_outgoing_sdp_stream,
 	.apply_negotiated_sdp_stream = audio_apply_negotiated_sdp_stream,
-	.change_outgoing_sdp_stream = audio_change_outgoing_sdp_stream,
+	.change_outgoing_sdp_stream_media_address = audio_change_outgoing_sdp_stream_media_address,
 };
 
 /*! \brief Session supplement for 'audio' media stream */
@@ -552,7 +552,7 @@
 }
 
 /*! \brief Function which updates the media stream with external media address, if applicable */
-static void audio_change_outgoing_sdp_stream(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport)
+static void audio_change_outgoing_sdp_stream_media_address(pjsip_tx_data *tdata, struct pjmedia_sdp_media *stream, struct ast_sip_transport *transport)
 {
 	char host[NI_MAXHOST];
 	struct ast_sockaddr addr = { { 0, } };

Modified: team/file/pimp_sip_nat/res/res_sip_session.c
URL: http://svnview.digium.com/svn/asterisk/team/file/pimp_sip_nat/res/res_sip_session.c?view=diff&rev=382783&r1=382782&r2=382783
==============================================================================
--- team/file/pimp_sip_nat/res/res_sip_session.c (original)
+++ team/file/pimp_sip_nat/res/res_sip_session.c Mon Mar 11 06:39:16 2013
@@ -1292,8 +1292,8 @@
 			continue;
 		}
 		AST_LIST_TRAVERSE(&handler_list->list, handler, next) {
-			if (handler->change_outgoing_sdp_stream) {
-				handler->change_outgoing_sdp_stream(tdata, sdp->media[stream], transport);
+			if (handler->change_outgoing_sdp_stream_media_address) {
+				handler->change_outgoing_sdp_stream_media_address(tdata, sdp->media[stream], transport);
 			}
 		}
 	}