[asterisk-commits] kmoore: trunk r395851 - in /trunk: channels/ configs/ include/asterisk/ res/r...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Jul 31 08:31:56 CDT 2013
Author: kmoore
Date: Wed Jul 31 08:31:55 2013
New Revision: 395851
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=395851
Log:
Fix remnants of the pjsip renaming
Modified:
trunk/channels/chan_pjsip.c
trunk/configs/pjsip.conf.sample
trunk/include/asterisk/res_pjsip.h
trunk/include/asterisk/res_pjsip_exten_state.h
trunk/include/asterisk/res_pjsip_pubsub.h
trunk/include/asterisk/res_pjsip_session.h
trunk/res/res_pjsip/include/res_pjsip_private.h
Modified: trunk/channels/chan_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_pjsip.c?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/channels/chan_pjsip.c (original)
+++ trunk/channels/chan_pjsip.c Wed Jul 31 08:31:55 2013
@@ -577,7 +577,7 @@
return NULL;
}
- /* If res_sip_session is ever updated to create/destroy ast_sip_session_media
+ /* If res_pjsip_session is ever updated to create/destroy ast_sip_session_media
* during a call such as if multiple same-type stream support is introduced,
* these will need to be recaptured as well */
pvt->media[SIP_MEDIA_AUDIO] = ao2_find(session->media, "audio", OBJ_KEY);
Modified: trunk/configs/pjsip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/pjsip.conf.sample?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/configs/pjsip.conf.sample (original)
+++ trunk/configs/pjsip.conf.sample Wed Jul 31 08:31:55 2013
@@ -1,4 +1,4 @@
-; This is an in-flux configuration file for the res_sip module, it will change as things progress
+; This is an in-flux configuration file for the res_pjsip module, it will change as things progress
;;; Transports
;[local]
Modified: trunk/include/asterisk/res_pjsip.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip.h?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/include/asterisk/res_pjsip.h (original)
+++ trunk/include/asterisk/res_pjsip.h Wed Jul 31 08:31:55 2013
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-#ifndef _RES_SIP_H
-#define _RES_SIP_H
+#ifndef _RES_PJSIP_H
+#define _RES_PJSIP_H
#include "asterisk/stringfields.h"
/* Needed for struct ast_sockaddr */
@@ -1499,4 +1499,4 @@
int ast_sip_initialize_sorcery_global(struct ast_sorcery *sorcery);
-#endif /* _RES_SIP_H */
+#endif /* _RES_PJSIP_H */
Modified: trunk/include/asterisk/res_pjsip_exten_state.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip_exten_state.h?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/include/asterisk/res_pjsip_exten_state.h (original)
+++ trunk/include/asterisk/res_pjsip_exten_state.h Wed Jul 31 08:31:55 2013
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-#ifndef _RES_SIP_EXTEN_STATE_H
-#define _RES_SIP_EXTEN_STATE_H
+#ifndef _RES_PJSIP_EXTEN_STATE_H
+#define _RES_PJSIP_EXTEN_STATE_H
#include "asterisk/stringfields.h"
#include "asterisk/linkedlists.h"
@@ -91,4 +91,4 @@
*/
void ast_sip_unregister_exten_state_provider(struct ast_sip_exten_state_provider *obj);
-#endif
+#endif /* _RES_PJSIP_EXTEN_STATE_H */
Modified: trunk/include/asterisk/res_pjsip_pubsub.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip_pubsub.h?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/include/asterisk/res_pjsip_pubsub.h (original)
+++ trunk/include/asterisk/res_pjsip_pubsub.h Wed Jul 31 08:31:55 2013
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-#ifndef _RES_SIP_PUBSUB_H
-#define _RES_SIP_PUBSUB_H
+#ifndef _RES_PJSIP_PUBSUB_H
+#define _RES_PJSIP_PUBSUB_H
#include "asterisk/linkedlists.h"
@@ -513,4 +513,4 @@
*/
void ast_sip_unregister_subscription_handler(struct ast_sip_subscription_handler *handler);
-#endif /* RES_SIP_PUBSUB_H */
+#endif /* RES_PJSIP_PUBSUB_H */
Modified: trunk/include/asterisk/res_pjsip_session.h
URL: http://svnview.digium.com/svn/asterisk/trunk/include/asterisk/res_pjsip_session.h?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/include/asterisk/res_pjsip_session.h (original)
+++ trunk/include/asterisk/res_pjsip_session.h Wed Jul 31 08:31:55 2013
@@ -16,8 +16,8 @@
* at the top of the source tree.
*/
-#ifndef _RES_SIP_SESSION_H
-#define _RES_SIP_SESSION_H
+#ifndef _RES_PJSIP_SESSION_H
+#define _RES_PJSIP_SESSION_H
/* Needed for pj_timer_entry definition */
#include "pjlib.h"
@@ -141,7 +141,7 @@
/*! Top priority. Supplements with this priority are those that need to run before any others */
AST_SIP_SESSION_SUPPLEMENT_PRIORITY_FIRST = 0,
/*! Channel creation priority.
- * chan_gulp creates a channel at this priority. If your supplement depends on being run before
+ * chan_pjsip creates a channel at this priority. If your supplement depends on being run before
* or after channel creation, then set your priority to be lower or higher than this value.
*/
AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL = 1000000,
@@ -466,7 +466,7 @@
* \brief Send a reinvite or UPDATE on a session
*
* This method will inspect the session in order to construct an appropriate
- * session refresh request. As with any outgoing request in res_sip_session,
+ * session refresh request. As with any outgoing request in res_pjsip_session,
* this will call into registered supplements in case they wish to add anything.
*
* Note: The on_request_creation callback may or may not be called in the same
@@ -558,4 +558,4 @@
*/
void ast_sip_session_resume_reinvite(struct ast_sip_session *session);
-#endif /* _RES_SIP_SESSION_H */
+#endif /* _RES_PJSIP_SESSION_H */
Modified: trunk/res/res_pjsip/include/res_pjsip_private.h
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/include/res_pjsip_private.h?view=diff&rev=395851&r1=395850&r2=395851
==============================================================================
--- trunk/res/res_pjsip/include/res_pjsip_private.h (original)
+++ trunk/res/res_pjsip/include/res_pjsip_private.h Wed Jul 31 08:31:55 2013
@@ -5,8 +5,8 @@
* Author: mjordan
*/
-#ifndef RES_SIP_PRIVATE_H_
-#define RES_SIP_PRIVATE_H_
+#ifndef RES_PJSIP_PRIVATE_H_
+#define RES_PJSIP_PRIVATE_H_
struct ao2_container;
@@ -71,4 +71,4 @@
*/
int ast_sip_initialize_global(void);
-#endif /* RES_SIP_PRIVATE_H_ */
+#endif /* RES_PJSIP_PRIVATE_H_ */
More information about the asterisk-commits
mailing list