From f6c7e6355e53d8d6a43d895e7133b1618a60d796 Mon Sep 17 00:00:00 2001 From: Kinsey Moore Date: Wed, 31 Jul 2013 13:31:55 +0000 Subject: [PATCH] Fix remnants of the pjsip renaming git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@395851 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_pjsip.c | 2 +- configs/pjsip.conf.sample | 2 +- include/asterisk/res_pjsip.h | 6 +++--- include/asterisk/res_pjsip_exten_state.h | 6 +++--- include/asterisk/res_pjsip_pubsub.h | 6 +++--- include/asterisk/res_pjsip_session.h | 10 +++++----- res/res_pjsip/include/res_pjsip_private.h | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/channels/chan_pjsip.c b/channels/chan_pjsip.c index 527ba27932..2e715e9ffb 100644 --- a/channels/chan_pjsip.c +++ b/channels/chan_pjsip.c @@ -577,7 +577,7 @@ static struct ast_channel *chan_pjsip_new(struct ast_sip_session *session, int s 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); diff --git a/configs/pjsip.conf.sample b/configs/pjsip.conf.sample index 34cd6d6458..dd4ff151c3 100644 --- a/configs/pjsip.conf.sample +++ b/configs/pjsip.conf.sample @@ -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] diff --git a/include/asterisk/res_pjsip.h b/include/asterisk/res_pjsip.h index 23d1a641ee..3d66cf399c 100644 --- a/include/asterisk/res_pjsip.h +++ b/include/asterisk/res_pjsip.h @@ -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_add_global_response_header(const char *name, const char *value, int int ast_sip_initialize_sorcery_global(struct ast_sorcery *sorcery); -#endif /* _RES_SIP_H */ +#endif /* _RES_PJSIP_H */ diff --git a/include/asterisk/res_pjsip_exten_state.h b/include/asterisk/res_pjsip_exten_state.h index 62662f9308..6a324a4f44 100644 --- a/include/asterisk/res_pjsip_exten_state.h +++ b/include/asterisk/res_pjsip_exten_state.h @@ -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 @@ int ast_sip_register_exten_state_provider(struct ast_sip_exten_state_provider *o */ void ast_sip_unregister_exten_state_provider(struct ast_sip_exten_state_provider *obj); -#endif +#endif /* _RES_PJSIP_EXTEN_STATE_H */ diff --git a/include/asterisk/res_pjsip_pubsub.h b/include/asterisk/res_pjsip_pubsub.h index e74f23bf5d..f6c6e4109c 100644 --- a/include/asterisk/res_pjsip_pubsub.h +++ b/include/asterisk/res_pjsip_pubsub.h @@ -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 @@ int ast_sip_register_subscription_handler(struct ast_sip_subscription_handler *h */ void ast_sip_unregister_subscription_handler(struct ast_sip_subscription_handler *handler); -#endif /* RES_SIP_PUBSUB_H */ +#endif /* RES_PJSIP_PUBSUB_H */ diff --git a/include/asterisk/res_pjsip_session.h b/include/asterisk/res_pjsip_session.h index 4c5ac5534e..2df2262ad6 100644 --- a/include/asterisk/res_pjsip_session.h +++ b/include/asterisk/res_pjsip_session.h @@ -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 @@ enum ast_sip_session_supplement_priority { /*! 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 @@ void ast_sip_session_remove_datastore(struct ast_sip_session *session, const cha * \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 @@ struct ast_sip_session *ast_sip_dialog_get_session(pjsip_dialog *dlg); */ void ast_sip_session_resume_reinvite(struct ast_sip_session *session); -#endif /* _RES_SIP_SESSION_H */ +#endif /* _RES_PJSIP_SESSION_H */ diff --git a/res/res_pjsip/include/res_pjsip_private.h b/res/res_pjsip/include/res_pjsip_private.h index ee9cc06ef2..20586b7088 100644 --- a/res/res_pjsip/include/res_pjsip_private.h +++ b/res/res_pjsip/include/res_pjsip_private.h @@ -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_system(void); */ int ast_sip_initialize_global(void); -#endif /* RES_SIP_PRIVATE_H_ */ +#endif /* RES_PJSIP_PRIVATE_H_ */