[svn-commits] kmoore: branch kmoore/pjsip_path_support r403159 - in /team/kmoore/pjsip_path...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Nov 26 14:57:27 CST 2013
Author: kmoore
Date: Tue Nov 26 14:57:26 2013
New Revision: 403159
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=403159
Log:
Fix naming for supplement priority enum
Modified:
team/kmoore/pjsip_path_support/channels/chan_pjsip.c
team/kmoore/pjsip_path_support/include/asterisk/res_pjsip.h
team/kmoore/pjsip_path_support/res/res_pjsip_caller_id.c
team/kmoore/pjsip_path_support/res/res_pjsip_diversion.c
team/kmoore/pjsip_path_support/res/res_pjsip_header_funcs.c
team/kmoore/pjsip_path_support/res/res_pjsip_refer.c
team/kmoore/pjsip_path_support/res/res_pjsip_t38.c
Modified: team/kmoore/pjsip_path_support/channels/chan_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/channels/chan_pjsip.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/channels/chan_pjsip.c (original)
+++ team/kmoore/pjsip_path_support/channels/chan_pjsip.c Tue Nov 26 14:57:26 2013
@@ -176,7 +176,7 @@
/*! \brief SIP session supplement structure */
static struct ast_sip_session_supplement chan_pjsip_supplement = {
.method = "INVITE",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL,
.session_begin = chan_pjsip_session_begin,
.session_end = chan_pjsip_session_end,
.incoming_request = chan_pjsip_incoming_request,
@@ -187,7 +187,7 @@
static struct ast_sip_session_supplement chan_pjsip_ack_supplement = {
.method = "ACK",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL,
.incoming_request = chan_pjsip_incoming_ack,
};
@@ -2014,7 +2014,7 @@
static struct ast_sip_session_supplement pbx_start_supplement = {
.method = "INVITE",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_LAST,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_LAST,
.incoming_request = pbx_start_incoming_request,
};
Modified: team/kmoore/pjsip_path_support/include/asterisk/res_pjsip.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/include/asterisk/res_pjsip.h?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/include/asterisk/res_pjsip.h (original)
+++ team/kmoore/pjsip_path_support/include/asterisk/res_pjsip.h Tue Nov 26 14:57:26 2013
@@ -1735,14 +1735,14 @@
enum ast_sip_supplement_priority {
/*! Top priority. Supplements with this priority are those that need to run before any others */
- AST_SIP_SESSION_SUPPLEMENT_PRIORITY_FIRST = 0,
+ AST_SIP_SUPPLEMENT_PRIORITY_FIRST = 0,
/*! Channel creation priority.
* 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,
+ AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL = 1000000,
/*! Lowest priority. Supplements with this priority should be run after all other supplements */
- AST_SIP_SESSION_SUPPLEMENT_PRIORITY_LAST = INT_MAX,
+ AST_SIP_SUPPLEMENT_PRIORITY_LAST = INT_MAX,
};
/*!
Modified: team/kmoore/pjsip_path_support/res/res_pjsip_caller_id.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/res/res_pjsip_caller_id.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/res/res_pjsip_caller_id.c (original)
+++ team/kmoore/pjsip_path_support/res/res_pjsip_caller_id.c Tue Nov 26 14:57:26 2013
@@ -689,7 +689,7 @@
static struct ast_sip_session_supplement caller_id_supplement = {
.method = "INVITE,UPDATE",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL - 1000,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL - 1000,
.incoming_request = caller_id_incoming_request,
.incoming_response = caller_id_incoming_response,
.outgoing_request = caller_id_outgoing_request,
Modified: team/kmoore/pjsip_path_support/res/res_pjsip_diversion.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/res/res_pjsip_diversion.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/res/res_pjsip_diversion.c (original)
+++ team/kmoore/pjsip_path_support/res/res_pjsip_diversion.c Tue Nov 26 14:57:26 2013
@@ -320,7 +320,7 @@
.method = "INVITE",
/* this supplement needs to be called after caller id
and after the channel has been created */
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL + 100,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL + 100,
.incoming_request = diversion_incoming_request,
.incoming_response = diversion_incoming_response,
.outgoing_request = diversion_outgoing_request,
Modified: team/kmoore/pjsip_path_support/res/res_pjsip_header_funcs.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/res/res_pjsip_header_funcs.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/res/res_pjsip_header_funcs.c (original)
+++ team/kmoore/pjsip_path_support/res/res_pjsip_header_funcs.c Tue Nov 26 14:57:26 2013
@@ -595,7 +595,7 @@
static struct ast_sip_session_supplement header_funcs_supplement = {
.method = "INVITE",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL - 1000,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL - 1000,
.incoming_request = incoming_request,
.outgoing_request = outgoing_request,
};
Modified: team/kmoore/pjsip_path_support/res/res_pjsip_refer.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/res/res_pjsip_refer.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/res/res_pjsip_refer.c (original)
+++ team/kmoore/pjsip_path_support/res/res_pjsip_refer.c Tue Nov 26 14:57:26 2013
@@ -912,7 +912,7 @@
}
static struct ast_sip_session_supplement refer_supplement = {
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL + 1,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL + 1,
.incoming_request = refer_incoming_request,
.outgoing_request = refer_outgoing_request,
};
Modified: team/kmoore/pjsip_path_support/res/res_pjsip_t38.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/pjsip_path_support/res/res_pjsip_t38.c?view=diff&rev=403159&r1=403158&r2=403159
==============================================================================
--- team/kmoore/pjsip_path_support/res/res_pjsip_t38.c (original)
+++ team/kmoore/pjsip_path_support/res/res_pjsip_t38.c Tue Nov 26 14:57:26 2013
@@ -494,7 +494,7 @@
/*! \brief Supplement for adding framehook to session channel */
static struct ast_sip_session_supplement t38_supplement = {
.method = "INVITE",
- .priority = AST_SIP_SESSION_SUPPLEMENT_PRIORITY_CHANNEL + 1,
+ .priority = AST_SIP_SUPPLEMENT_PRIORITY_CHANNEL + 1,
.incoming_request = t38_incoming_invite_request,
.outgoing_request = t38_outgoing_invite_request,
};
More information about the svn-commits
mailing list